[Vtigercrm-commits] [vtiger-commits] r4398 - in /vtigercrm/branches/4.2: data/CRMEntity.php modules/Potentials/updateRelations.php modules/Users/UserInfoUtil.php schema/DatabaseSchema.xml
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Wed Mar 22 23:48:58 EST 2006
Author: mfedyk
Date: Wed Mar 22 21:48:54 2006
New Revision: 4398
Log:
merge the non-postgres specific changes from 4.2_postgresql_integration. refs #17 and #62
Modified:
vtigercrm/branches/4.2/data/CRMEntity.php
vtigercrm/branches/4.2/modules/Potentials/updateRelations.php
vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php
vtigercrm/branches/4.2/schema/DatabaseSchema.xml
Modified: vtigercrm/branches/4.2/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/4.2/data/CRMEntity.php (original)
+++ vtigercrm/branches/4.2/data/CRMEntity.php Wed Mar 22 21:48:54 2006
@@ -272,7 +272,7 @@
}
//This check is done for products.
- if($module == 'Products' || $module == 'Notes' || $module =='Faq')
+ if($module == 'Products' || $module == 'Notes' || $module =='Faq' || $module == 'PriceBook' || $module == 'Vendor' || $module == 'Emails')
{
$vtlog->logthis("module is =".$module,'info');
$ownerid = $current_user->id;
Modified: vtigercrm/branches/4.2/modules/Potentials/updateRelations.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/updateRelations.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/updateRelations.php Wed Mar 22 21:48:54 2006
@@ -15,8 +15,9 @@
//if($_REQUEST['module']=='Users')
// $sql = "insert into salesmanactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
//else
+if($_REQUEST['module']=='Potentials')
$sql = "insert into contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
-$adb->query($sql);
+else
$sql = "insert into seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")";
$adb->query($sql);
header("Location: index.php?action=DetailView&module=Potentials&record=".$_REQUEST["parid"]);
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 Wed Mar 22 21:48:54 2006
@@ -571,6 +571,7 @@
global $adb;
$sqldelete = "delete from activitygrouprelation where activityid=".$activityid;
$adb->query($sqldelete);
+ if($groupname == '') return;
$sql = "insert into activitygrouprelation values (".$activityid .",'" .$groupname ."')";
$adb->query($sql);
Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original)
+++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Wed Mar 22 21:48:54 2006
@@ -160,7 +160,7 @@
<opt>Type=InnoDB</opt> <index name="Tab_IDX0">
<col>modifiedby</col>
</index>
- <index name="tabid">
+ <index name="tab_tabid">
<col>tabid</col>
</index>
<data>
@@ -225,7 +225,7 @@
<index name="fieldname">
<col>fieldname</col>
</index>
- <index name="tabid">
+ <index name="field_tabid">
<col>tabid</col>
<col>block</col>
<col>displaytype</col>
@@ -726,7 +726,6 @@
<DEFAULT value="0"/>
</field>
<field name="contact_id" type="I" size="19">
- <KEY/>
<DEFAULT value="0"/>
</field>
@@ -808,10 +807,10 @@
<opt>Type=InnoDB</opt> <index name="Potential_IDX0">
<col>accountid</col>
</index>
- <index name="potentialid">
+ <index name="potential_potentialid">
<col>potentialid</col>
</index>
- <index name="sales_stage">
+ <index name="potentail_sales_stage">
<col>sales_stage</col>
</index>
<opt>Type=InnoDB</opt>
@@ -845,7 +844,7 @@
<field name="amount" type="N"></field>
<field name="stage" type="C" size="100"></field>
- <field name="probability" type="N" size="2.3"></field>
+ <field name="probability" type="N" size="7.3"></field>
<field name="expectedrevenue" type="N"></field>
<field name="closedate" type="D"></field>
<field name="lastmodified" type="T">
@@ -945,7 +944,7 @@
<col>activityid</col>
<col>subject</col>
</index>
- <index name="activitytype">
+ <index name="activity_activitytype">
<col>activitytype</col>
<col>date_start</col>
</index>
@@ -957,10 +956,10 @@
<col>date_start</col>
<col>time_start</col>
</index>
- <index name="eventstatus">
+ <index name="activity_eventstatus">
<col>eventstatus</col>
</index>
- <index name="status">
+ <index name="activity_status">
<col>status</col>
<col>eventstatus</col>
</index>
@@ -1003,7 +1002,7 @@
</field>
<opt>Type=InnoDB</opt>
- <index name="attachmentsid">
+ <index name="attachments_attachmentsid">
<col>attachmentsid</col>
</index>
<index name="description">
@@ -1044,7 +1043,7 @@
<opt>Type=InnoDB</opt> <index name="SeAttachmentsRel_IDX1">
<col>crmid</col>
</index>
- <index name="attachmentsid">
+ <index name="seattachmentsrel_attachmentsid">
<col>attachmentsid</col>
<col>crmid</col>
</index>
@@ -1180,7 +1179,7 @@
<field name="start_date" type="D"></field>
<field name="expiry_date" type="D"></field>
<field name="cost_factor" type="I" size="11"></field>
- <field name="commissionrate" type="N" size="3.3"></field>
+ <field name="commissionrate" type="N" size="7.3"></field>
<field name="commissionmethod" type="C" size="50"></field>
<field name="discontinued" type="I" size="1"></field>
<field name="usageunit" type="C" size="200"></field>
@@ -1582,7 +1581,7 @@
<DEFAULT value="0"/>
</field>
- <field name="dealprobability" type="N" size="2.3">
+ <field name="dealprobability" type="N" size="7.3">
<NOTNULL/>
<DEFAULT value="0"/>
</field>
@@ -1757,7 +1756,7 @@
<index name="troubletickets_IDX0">
<col>ticketid</col>
</index>
- <index name="status">
+ <index name="troubletickets_status">
<col>status</col>
</index>
@@ -1788,6 +1787,7 @@
</field>
<field name="ownertype" type="C" size="10"></field>
<field name="createdtime" type="T" >
+ <DEFTIMESTAMP/>
<NOTNULL/>
</field>
@@ -2381,6 +2381,7 @@
<field name="faqid" type="I" size="19"></field>
<field name="comments" type="X"></field>
<field name="createdtime" type="T" >
+ <DEFTIMESTAMP/>
<NOTNULL/>
</field>
@@ -3033,7 +3034,7 @@
<DEFAULT value="1"/>
</field>
- <field name="probability" type="N" size="2.3">
+ <field name="probability" type="N" size="7.3">
<DEFAULT value="0"/>
</field>
<opt>Type=InnoDB</opt> <index name="OpportunityStage_UK0">
@@ -3572,7 +3573,7 @@
<NOTNULL/>
<DEFAULT value="0"/>
</field>
- <index name="idx_profile2tab">
+ <index name="profile2tab_profile2tab">
<col>profileid</col>
<col>tabid</col>
</index>
@@ -3607,11 +3608,11 @@
<col>tabid</col>
<col>fieldname</col>
</index>
- <index name="tabid">
+ <index name="profile2field_tabid">
<col>tabid</col>
<col>profileid</col>
</index>
- <index name="visible">
+ <index name="profile2field_visible">
<col>visible</col>
<col>profileid</col>
</index>
@@ -3657,10 +3658,10 @@
<col>tabid</col>
<col>fieldid</col>
</index>
- <index name="tabid">
+ <index name="def_org_field_tabid">
<col>tabid</col>
</index>
- <index name="visible">
+ <index name="def_org_field_visible">
<col>visible</col>
<col>fieldid</col>
</index>
@@ -3793,7 +3794,7 @@
<NOTNULL/>
<DEFAULT value="0"/>
</field>
- <index name="idx_profile2tab">
+ <index name="relatedlists_profile2tab">
<col>relation_id</col>
</index>
@@ -4050,10 +4051,10 @@
<field name="total" type="N" size="11.3"></field>
<field name="accountid" type="I" size="19"></field>
<field name="terms_conditions" type="X"></field>
- <index name="quotestage">
+ <index name="quote_quotestage">
<col>quotestage</col>
</index>
- <index name="potentialid">
+ <index name="quotes_potentialid">
<col>potentialid</col>
</index>
<index name="contactid">
@@ -4799,10 +4800,10 @@
<DEFAULT value=""/>
</field>
<field name="startdate" type="D">
- <DEFAULT value=""/>
+ <DEFAULT value="NULL"/>
</field>
<field name="enddate" type="D">
- <DEFAULT value=""/>
+ <DEFAULT value="NULL"/>
</field>
<index name="cvstdfilter_IDX0">
<col>cvid</col>
@@ -4873,6 +4874,7 @@
<table name="selectquery">
<field name="queryid" type="I" size="19">
+ <KEY />
<NOTNULL/>
</field>
<field name="startindex" type="I" size="19">
@@ -5070,10 +5072,10 @@
<DEFAULT value=""/>
</field>
<field name="startdate" type="D">
- <DEFAULT value=""/>
+ <DEFAULT value="NULL"/>
</field>
<field name="enddate" type="D">
- <DEFAULT value=""/>
+ <DEFAULT value="NULL"/>
</field>
<index name="reportdatefilter_IDX0">
<col>datefilterid</col>
More information about the vtigercrm-commits
mailing list