svn commit: r632034 - in /ofbiz/trunk/applications: accounting/entitydef/ marketing/entitydef/ order/entitydef/ party/data/ party/entitydef/ workeffort/entitydef/

[mor-2]

Author: mor
Date: Thu Feb 28 07:55:59 2008
New Revision: 632034

URL: http://svn.apache.org/viewvc?rev=632034&view=rev
Log:
Applied patch from Jira Issue OFBIZ-1686 (https://issues.apache.org/jira/browse/OFBIZ-1686)
Added new Entity definations for SalesOpportunityTrackingCode, SalesOpportunityCompetitor
with modifications to other entities for SFA component

Thanks to Jyotsna Rathore, Saurabh Nayak for the patch.

Modified:
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml
    ofbiz/trunk/applications/order/entitydef/entitygroup.xml
    ofbiz/trunk/applications/order/entitydef/entitymodel.xml
    ofbiz/trunk/applications/party/data/PartyTypeData.xml
    ofbiz/trunk/applications/party/entitydef/entitymodel.xml
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Thu Feb 28 07:55:59 2008
@@ -1121,6 +1121,7 @@
       <field name="taxAuthPartyId" type="id-ne"/>
       <field name="taxAuthGeoId" type="id-ne"/>
       <field name="taxAuthorityRateSeqId" type="id-ne"></field>
+      <field name="salesOpportunityId" type="id-ne"></field>
       <prim-key field="invoiceId"/>
       <prim-key field="invoiceItemSeqId"/>
       <relation type="one" fk-name="INVOICE_ITMITYP" rel-entity-name="InvoiceItemType">
@@ -1166,6 +1167,9 @@
       </relation>
       <relation type="one" fk-name="INVCE_ITM_OVRPTY" title="OverrideOrg" rel-entity-name="Party">
         <key-map field-name="overrideOrgPartyId" rel-field-name="partyId"/>
+      </relation>
+      <relation type="one" fk-name="INVCE_ITM_SLSOPP" rel-entity-name="SalesOpportunity" >
+            <key-map field-name="salesOpportunityId"/>
       </relation>
     </entity>
     <entity entity-name="InvoiceItemAttribute"

Modified: ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml Thu Feb 28 07:55:59 2008
@@ -57,6 +57,14 @@
       <field name="currencyUomId" type="id-ne"></field>
       <field name="fromDate" type="date-time"></field>
       <field name="thruDate" type="date-time"></field>
+      <field name="isActive" type="indicator"></field>
+      <field name="convertedLeads" type="id-ne"></field>
+      <field name="expectedResponsePercent" type="id-ne"></field>
+      <field name="expectedRevenue" type="currency-amount"></field>
+      <field name="numSent" type="id-ne"></field>
+       <field name="startDate" type="date-time"></field>
+      <field name="createdByUserLogin" type="id-vlong"></field>
+      <field name="lastModifiedByUserLogin" type="id-vlong"></field>
       <prim-key field="marketingCampaignId"/>
       <relation type="one" fk-name="MKTGCPN_PRNT" title="Parent" rel-entity-name="MarketingCampaign">
         <key-map field-name="parentCampaignId" rel-field-name="marketingCampaignId"/>

Modified: ofbiz/trunk/applications/order/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitygroup.xml?rev=632034&r1=632033&r2=632034&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitygroup.xml Thu Feb 28 07:55:59 2008
@@ -198,11 +198,13 @@
     <!-- ========================================================= -->
     
     <entity-group group="org.ofbiz" entity="SalesOpportunity" />
+    <entity-group group="org.ofbiz" entity="SalesOpportunityCompetitor" />
     <entity-group group="org.ofbiz" entity="SalesOpportunityHistory" />
     <entity-group group="org.ofbiz" entity="SalesOpportunityRole" />
     <entity-group group="org.ofbiz" entity="SalesOpportunityStage" />
     <entity-group group="org.ofbiz" entity="SalesOpportunityWorkEffort" />
     <entity-group group="org.ofbiz" entity="SalesOpportunityQuote" />
+    <entity-group group="org.ofbiz" entity="SalesOpportunityTrackingCode" />
     <entity-group group="org.ofbiz" entity="SalesForecast" />
     <entity-group group="org.ofbiz" entity="SalesForecastHistory" />
     <entity-group group="org.ofbiz" entity="SalesForecastAndCustomTimePeriod" />

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Thu Feb 28 07:55:59 2008
@@ -475,6 +475,7 @@
       <field name="shipBeforeDate" type="date-time"></field>
       <field name="shipAfterDate" type="date-time"></field>
       <field name="overrideGlAccountId" type="id"><!-- used to specify the override or actual glAccountId used for the adjustment, avoids problems if configuration changes after initial posting, etc --></field>
+      <field name="salesOpportunityId" type="id-ne"></field>
       <prim-key field="orderId"/>
       <prim-key field="orderItemSeqId"/>
       <relation type="one" fk-name="ORDER_ITEM_HDR" rel-entity-name="OrderHeader">
@@ -521,6 +522,9 @@
       <relation type="one" fk-name="ORDER_ITEM_OGLA" title="Override" rel-entity-name="GlAccount">
         <key-map field-name="overrideGlAccountId" rel-field-name="glAccountId"/>
       </relation>
+      <relation type="one" fk-name="ORDER_ITEM_SLSOPP" rel-entity-name="SalesOpportunity" >
+            <key-map field-name="salesOpportunityId"/>
+      </relation>
       <index name="ORDITMEXT_ID_IDX">
         <index-field name="externalId"/>
       </index>
@@ -1583,6 +1587,11 @@
               Field to support a location of a cust request--ie, product literature sent to an address, service call at a localtion, etc.
           </description>
       </field>
+      <field name="currencyUomId" type="id"></field>
+      <field name="openDateTime" type="date-time"></field>
+      <field name="closedDateTime" type="date-time"></field>
+      <field name="internalComment" type="comment"></field>
+      <field name="reason" type="description"></field>
       <field name="createdDate" type="date-time"></field>
       <field name="createdByUserLogin" type="id-vlong"></field>
       <field name="lastModifiedDate" type="date-time"></field>
@@ -1615,6 +1624,9 @@
       <relation type="one" fk-name="CUST_REQ_FULCM" title="Fulfill" rel-entity-name="ContactMech">
           <key-map field-name="fulfillContactMechId" rel-field-name="contactMechId"/>
       </relation>
+      <relation type="one" fk-name="CUST_REQ_CUOM" rel-entity-name="Uom">
+            <key-map field-name="currencyUomId" rel-field-name="uomId"/>
+      </relation>
     </entity>
     <entity entity-name="CustRequestAttribute"
             package-name="org.ofbiz.order.request"
@@ -2798,6 +2810,7 @@
         <field name="closedAmount" type="currency-amount"/>
         <field name="percentOfQuotaForecast" type="floating-point"/>
         <field name="percentOfQuotaClosed" type="floating-point"/>
+        <field name="pipelineAmount" type="currency-amount"></field>
         <field name="createdByUserLoginId" type="id-vlong"></field>
         <field name="modifiedByUserLoginId" type="id-vlong"></field>
         <prim-key field="salesForecastId"/>
@@ -2863,6 +2876,32 @@
         </relation>
         <relation type="one" fk-name="SALES4CH_MOD_USER" title="ModifiedBy" rel-entity-name="UserLogin">
             <key-map field-name="modifiedByUserLoginId" rel-field-name="userLoginId"/>
+        </relation>
+    </entity>
+    <entity entity-name="SalesOpportunityCompetitor"
+            package-name="org.ofbiz.order.opportunity"
+            title="Sales opportunity competitors record">
+        <field name="salesOpportunityId" type="id-ne"></field>
+        <field name="competitorPartyId" type="id-ne"></field>
+        <field name="positionEnumId" type="id-ne"></field>
+        <field name="strengths" type="very-long"></field>
+        <field name="weaknesses" type="very-long"></field>
+        <prim-key field="salesOpportunityId"/>
+        <prim-key field="competitorPartyId"/>
+        <relation type="one" fk-name="SOPPCOMP_SOPP" rel-entity-name="SalesOpportunity">
+            <key-map field-name="salesOpportunityId"/>
+        </relation>
+    </entity>
+    <entity entity-name="SalesOpportunityTrackingCode"
+            package-name="org.ofbiz.order.opportunity"
+            title="Sales opportunity traking code">
+        <field name="salesOpportunityId" type="id-ne"></field>    
+        <field name="trackingCodeId" type="id-ne"></field>
+        <field name="receivedDate" type="date-time"></field>
+        <prim-key field="salesOpportunityId"/>
+        <prim-key field="trackingCodeId"/>
+        <relation type="one" fk-name="SOPPTRKCD_SOPP" rel-entity-name="SalesOpportunity">
+            <key-map field-name="salesOpportunityId"/>
         </relation>
     </entity>
 

Modified: ofbiz/trunk/applications/party/data/PartyTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyTypeData.xml?rev=632034&r1=632033&r2=632034&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyTypeData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyTypeData.xml Thu Feb 28 07:55:59 2008
@@ -144,6 +144,7 @@
     <Enumeration description="Party Invitation Email" enumCode="INVITE_EMAIL" enumId="PRDS_PARTYINV_EMAIL" sequenceId="04" enumTypeId="PARTY_EMAIL"/>
 
     <!-- top level role types -->
+    <RoleType description="Account" hasTable="N" parentTypeId="" roleTypeId="ACCOUNT"/>
     <RoleType description="Administrator" hasTable="N" parentTypeId="" roleTypeId="ADMIN"/>
     <RoleType description="Agent" hasTable="N" parentTypeId="" roleTypeId="AGENT"/>
     <RoleType description="Automated Agent" hasTable="N" parentTypeId="" roleTypeId="AUTOMATED_AGENT_ROLE"/>
@@ -236,7 +237,12 @@
     <PartyClassificationType description="Trade" hasTable="N" parentTypeId="" partyClassificationTypeId="TRADE_CLASSIFICATION"/>
     <PartyClassificationType description="Wholesale" hasTable="N" parentTypeId="TRADE_CLASSIFICATION" partyClassificationTypeId="TRADE_WHOLE_CLASSIFI"/>
     <PartyClassificationType description="Retail" hasTable="N" parentTypeId="TRADE_CLASSIFICATION" partyClassificationTypeId="TRADE_RETAIL_CLASSIF"/>
-
+    <PartyClassificationType description="Annual Revenue" hasTable="N" parentTypeId="" partyClassificationTypeId="ANNUAL_REVENUE"/>
+    <PartyClassificationType description="Number of Employees" hasTable="N" parentTypeId="" partyClassificationTypeId="NUMBER_OF_EMPLOYEES"/>
+    <PartyClassificationType description="Value Rating" hasTable="N" parentTypeId="" partyClassificationTypeId="VALUE_RATING"/>
+    <PartyClassificationType description="SIC Code" hasTable="N" parentTypeId="" partyClassificationTypeId="SIC_CODE"/>  
+    <PartyClassificationType description="Ownership" hasTable="N" parentTypeId="" partyClassificationTypeId="OWNERSHIP"/>
+  
     <PartyQualType description="Work experience" hasTable="N" parentTypeId="" partyQualTypeId="EXPERIENCE"/>
     <PartyQualType description="Certification" hasTable="N" parentTypeId="" partyQualTypeId="CERTIFICATION"/>
     <PartyQualType description="Degree" hasTable="N" parentTypeId="" partyQualTypeId="DEGREE"/>
@@ -259,7 +265,12 @@
     <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Spouse" partyRelationshipTypeId="SPOUSE" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
     <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Supplier" partyRelationshipTypeId="SUPPLIER_REL" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
     <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Web Master" partyRelationshipTypeId="WEB_MASTER_ASSIGNMEN" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-
+    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Account" partyRelationshipTypeId="ACCOUNT" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
+    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Assistant" partyRelationshipTypeId="ASSISTANT" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
+    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Owner" partyRelationshipTypeId="OWNER" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
+    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Parent Account" partyRelationshipTypeId="PARENT_ACCOUNT" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
+    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Reports To" partyRelationshipTypeId="REPORTS_TO" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
+  
     <PartyType description="Automated Agent" hasTable="N" parentTypeId="" partyTypeId="AUTOMATED_AGENT"/>
     <PartyType description="Person" hasTable="Y" parentTypeId="" partyTypeId="PERSON"/>
     <PartyType description="Party Group" hasTable="Y" parentTypeId="" partyTypeId="PARTY_GROUP"/>

Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Thu Feb 28 07:55:59 2008
@@ -1430,6 +1430,8 @@
       <field name="createdByUserLogin" type="id-vlong"></field>
       <field name="lastModifiedDate" type="date-time"></field>
       <field name="lastModifiedByUserLogin" type="id-vlong"></field>
+      <field name="dataSourceId" type="id"></field>
+      <field name="isUnread" type="indicator"></field>        
       <prim-key field="partyId"/>
       <relation type="one" fk-name="PARTY_PTY_TYP" rel-entity-name="PartyType">
         <key-map field-name="partyTypeId"/>
@@ -1449,6 +1451,9 @@
       <relation type="many" rel-entity-name="PartyTypeAttr">
         <key-map field-name="partyTypeId"/>
       </relation>
+      <relation type="one" fk-name="PARTY_DATSRC" rel-entity-name="DataSource">
+        <key-map field-name="dataSourceId"/>
+      </relation>        
       <index name="PARTYEXT_ID_IDX">
         <index-field name="externalId"/>
       </index>
@@ -1799,6 +1804,9 @@
       <field name="groupName" type="name"></field>
       <field name="groupNameLocal" type="name"></field>  
       <field name="officeSiteName" type="name"></field>
+      <field name="annualRevenue" type="currency-amount"></field>
+      <field name="numEmployees" type="numeric"></field>
+      <field name="tickerSymbol" type="id-ne"></field>        
       <field name="comments" type="comment"></field>
       <field name="logoImageUrl" type="url"></field>
       <prim-key field="partyId"/>
@@ -1975,6 +1983,8 @@
       <field name="securityGroupId" type="id-ne"></field>
       <field name="priorityTypeId" type="id"></field>
       <field name="partyRelationshipTypeId" type="id"></field>
+      <field name="permissionsEnumId" type="id-ne"></field>
+      <field name="positionTitle" type="name"><description>The exact word used within the company</description></field>
       <field name="comments" type="comment"></field>
       <prim-key field="partyIdFrom"/>
       <prim-key field="partyIdTo"/>
@@ -2276,7 +2286,9 @@
       <field name="suffix" type="name"></field>
       <field name="nickname" type="name"></field>
       <field name="firstNameLocal" type="name"></field>
+      <field name="middleNameLocal" type="name"></field>        
       <field name="lastNameLocal" type="name"></field>
+      <field name="otherLocal" type="name"></field>        
       <field name="memberId" type="id"></field>
       <field name="gender" type="indicator"></field>
       <field name="birthDate" type="date"></field>

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Thu Feb 28 07:55:59 2008
@@ -247,6 +247,8 @@
       <field name="priority" type="numeric"></field>
       <field name="percentComplete" type="numeric"></field>
       <field name="workEffortName" type="name"></field>
+      <field name="showAsEnumId" type="id"></field>
+      <field name="sendNotificationEmail" type="indicator"></field>
       <field name="description" type="description"></field>
       <field name="locationDesc" type="description"></field>
       <field name="estimatedStartDate" type="date-time"></field>

[David E Jones-2]

These look good based on my limited memory of the analysis I did on  
this way back when. Thanks for your work on these Vikas, Jyotsna, and  
Saurabh.

A few of the types need some fixing up, including:

tickerSymbol should be "very-short" instead of "id-ne"
numSent should be "numeric"
expectedResponsePercent should be "floating-point"

-David


On Feb 28, 2008, at 8:56 AM, [hidden email] wrote:

> Author: mor
> Date: Thu Feb 28 07:55:59 2008
> New Revision: 632034
>
> URL: http://svn.apache.org/viewvc?rev=632034&view=rev
> Log:
> Applied patch from Jira Issue OFBIZ-1686 (https://issues.apache.org/jira/browse/OFBIZ-1686 
> )
> Added new Entity definations for SalesOpportunityTrackingCode,  
> SalesOpportunityCompetitor
> with modifications to other entities for SFA component
>
> Thanks to Jyotsna Rathore, Saurabh Nayak for the patch.
>
> Modified:
>    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
>    ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml
>    ofbiz/trunk/applications/order/entitydef/entitygroup.xml
>    ofbiz/trunk/applications/order/entitydef/entitymodel.xml
>    ofbiz/trunk/applications/party/data/PartyTypeData.xml
>    ofbiz/trunk/applications/party/entitydef/entitymodel.xml
>    ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
>
> Modified: ofbiz/trunk/applications/accounting/entitydef/
> entitymodel.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml  
> (original)
> +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml  
> Thu Feb 28 07:55:59 2008
> @@ -1121,6 +1121,7 @@
>       <field name="taxAuthPartyId" type="id-ne"/>
>       <field name="taxAuthGeoId" type="id-ne"/>
>       <field name="taxAuthorityRateSeqId" type="id-ne"></field>
> +      <field name="salesOpportunityId" type="id-ne"></field>
>       <prim-key field="invoiceId"/>
>       <prim-key field="invoiceItemSeqId"/>
>       <relation type="one" fk-name="INVOICE_ITMITYP" rel-entity-
> name="InvoiceItemType">
> @@ -1166,6 +1167,9 @@
>       </relation>
>       <relation type="one" fk-name="INVCE_ITM_OVRPTY"  
> title="OverrideOrg" rel-entity-name="Party">
>         <key-map field-name="overrideOrgPartyId" rel-field-
> name="partyId"/>
> +      </relation>
> +      <relation type="one" fk-name="INVCE_ITM_SLSOPP" rel-entity-
> name="SalesOpportunity" >
> +            <key-map field-name="salesOpportunityId"/>
>       </relation>
>     </entity>
>     <entity entity-name="InvoiceItemAttribute"
>
> Modified: ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml  
> (original)
> +++ ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml Thu  
> Feb 28 07:55:59 2008
> @@ -57,6 +57,14 @@
>       <field name="currencyUomId" type="id-ne"></field>
>       <field name="fromDate" type="date-time"></field>
>       <field name="thruDate" type="date-time"></field>
> +      <field name="isActive" type="indicator"></field>
> +      <field name="convertedLeads" type="id-ne"></field>
> +      <field name="expectedResponsePercent" type="id-ne"></field>
> +      <field name="expectedRevenue" type="currency-amount"></field>
> +      <field name="numSent" type="id-ne"></field>
> +       <field name="startDate" type="date-time"></field>
> +      <field name="createdByUserLogin" type="id-vlong"></field>
> +      <field name="lastModifiedByUserLogin" type="id-vlong"></field>
>       <prim-key field="marketingCampaignId"/>
>       <relation type="one" fk-name="MKTGCPN_PRNT" title="Parent" rel-
> entity-name="MarketingCampaign">
>         <key-map field-name="parentCampaignId" rel-field-
> name="marketingCampaignId"/>
>
> Modified: ofbiz/trunk/applications/order/entitydef/entitygroup.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitygroup.xml?rev=632034&r1=632033&r2=632034&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/order/entitydef/entitygroup.xml  
> (original)
> +++ ofbiz/trunk/applications/order/entitydef/entitygroup.xml Thu Feb  
> 28 07:55:59 2008
> @@ -198,11 +198,13 @@
>     <!-- ========================================================= -->
>
>     <entity-group group="org.ofbiz" entity="SalesOpportunity" />
> +    <entity-group group="org.ofbiz"  
> entity="SalesOpportunityCompetitor" />
>     <entity-group group="org.ofbiz"  
> entity="SalesOpportunityHistory" />
>     <entity-group group="org.ofbiz" entity="SalesOpportunityRole" />
>     <entity-group group="org.ofbiz" entity="SalesOpportunityStage" />
>     <entity-group group="org.ofbiz"  
> entity="SalesOpportunityWorkEffort" />
>     <entity-group group="org.ofbiz" entity="SalesOpportunityQuote" />
> +    <entity-group group="org.ofbiz"  
> entity="SalesOpportunityTrackingCode" />
>     <entity-group group="org.ofbiz" entity="SalesForecast" />
>     <entity-group group="org.ofbiz" entity="SalesForecastHistory" />
>     <entity-group group="org.ofbiz"  
> entity="SalesForecastAndCustomTimePeriod" />
>
> Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/order/entitydef/entitymodel.xml  
> (original)
> +++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Thu Feb  
> 28 07:55:59 2008
> @@ -475,6 +475,7 @@
>       <field name="shipBeforeDate" type="date-time"></field>
>       <field name="shipAfterDate" type="date-time"></field>
>       <field name="overrideGlAccountId" type="id"><!-- used to  
> specify the override or actual glAccountId used for the adjustment,  
> avoids problems if configuration changes after initial posting, etc  
> --></field>
> +      <field name="salesOpportunityId" type="id-ne"></field>
>       <prim-key field="orderId"/>
>       <prim-key field="orderItemSeqId"/>
>       <relation type="one" fk-name="ORDER_ITEM_HDR" rel-entity-
> name="OrderHeader">
> @@ -521,6 +522,9 @@
>       <relation type="one" fk-name="ORDER_ITEM_OGLA"  
> title="Override" rel-entity-name="GlAccount">
>         <key-map field-name="overrideGlAccountId" rel-field-
> name="glAccountId"/>
>       </relation>
> +      <relation type="one" fk-name="ORDER_ITEM_SLSOPP" rel-entity-
> name="SalesOpportunity" >
> +            <key-map field-name="salesOpportunityId"/>
> +      </relation>
>       <index name="ORDITMEXT_ID_IDX">
>         <index-field name="externalId"/>
>       </index>
> @@ -1583,6 +1587,11 @@
>               Field to support a location of a cust request--ie,  
> product literature sent to an address, service call at a localtion,  
> etc.
>           </description>
>       </field>
> +      <field name="currencyUomId" type="id"></field>
> +      <field name="openDateTime" type="date-time"></field>
> +      <field name="closedDateTime" type="date-time"></field>
> +      <field name="internalComment" type="comment"></field>
> +      <field name="reason" type="description"></field>
>       <field name="createdDate" type="date-time"></field>
>       <field name="createdByUserLogin" type="id-vlong"></field>
>       <field name="lastModifiedDate" type="date-time"></field>
> @@ -1615,6 +1624,9 @@
>       <relation type="one" fk-name="CUST_REQ_FULCM" title="Fulfill"  
> rel-entity-name="ContactMech">
>           <key-map field-name="fulfillContactMechId" rel-field-
> name="contactMechId"/>
>       </relation>
> +      <relation type="one" fk-name="CUST_REQ_CUOM" rel-entity-
> name="Uom">
> +            <key-map field-name="currencyUomId" rel-field-
> name="uomId"/>
> +      </relation>
>     </entity>
>     <entity entity-name="CustRequestAttribute"
>             package-name="org.ofbiz.order.request"
> @@ -2798,6 +2810,7 @@
>         <field name="closedAmount" type="currency-amount"/>
>         <field name="percentOfQuotaForecast" type="floating-point"/>
>         <field name="percentOfQuotaClosed" type="floating-point"/>
> +        <field name="pipelineAmount" type="currency-amount"></field>
>         <field name="createdByUserLoginId" type="id-vlong"></field>
>         <field name="modifiedByUserLoginId" type="id-vlong"></field>
>         <prim-key field="salesForecastId"/>
> @@ -2863,6 +2876,32 @@
>         </relation>
>         <relation type="one" fk-name="SALES4CH_MOD_USER"  
> title="ModifiedBy" rel-entity-name="UserLogin">
>             <key-map field-name="modifiedByUserLoginId" rel-field-
> name="userLoginId"/>
> +        </relation>
> +    </entity>
> +    <entity entity-name="SalesOpportunityCompetitor"
> +            package-name="org.ofbiz.order.opportunity"
> +            title="Sales opportunity competitors record">
> +        <field name="salesOpportunityId" type="id-ne"></field>
> +        <field name="competitorPartyId" type="id-ne"></field>
> +        <field name="positionEnumId" type="id-ne"></field>
> +        <field name="strengths" type="very-long"></field>
> +        <field name="weaknesses" type="very-long"></field>
> +        <prim-key field="salesOpportunityId"/>
> +        <prim-key field="competitorPartyId"/>
> +        <relation type="one" fk-name="SOPPCOMP_SOPP" rel-entity-
> name="SalesOpportunity">
> +            <key-map field-name="salesOpportunityId"/>
> +        </relation>
> +    </entity>
> +    <entity entity-name="SalesOpportunityTrackingCode"
> +            package-name="org.ofbiz.order.opportunity"
> +            title="Sales opportunity traking code">
> +        <field name="salesOpportunityId" type="id-ne"></field>
> +        <field name="trackingCodeId" type="id-ne"></field>
> +        <field name="receivedDate" type="date-time"></field>
> +        <prim-key field="salesOpportunityId"/>
> +        <prim-key field="trackingCodeId"/>
> +        <relation type="one" fk-name="SOPPTRKCD_SOPP" rel-entity-
> name="SalesOpportunity">
> +            <key-map field-name="salesOpportunityId"/>
>         </relation>
>     </entity>
>
>
> Modified: ofbiz/trunk/applications/party/data/PartyTypeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyTypeData.xml?rev=632034&r1=632033&r2=632034&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/party/data/PartyTypeData.xml (original)
> +++ ofbiz/trunk/applications/party/data/PartyTypeData.xml Thu Feb 28  
> 07:55:59 2008
> @@ -144,6 +144,7 @@
>     <Enumeration description="Party Invitation Email"  
> enumCode="INVITE_EMAIL" enumId="PRDS_PARTYINV_EMAIL" sequenceId="04"  
> enumTypeId="PARTY_EMAIL"/>
>
>     <!-- top level role types -->
> +    <RoleType description="Account" hasTable="N" parentTypeId=""  
> roleTypeId="ACCOUNT"/>
>     <RoleType description="Administrator" hasTable="N"  
> parentTypeId="" roleTypeId="ADMIN"/>
>     <RoleType description="Agent" hasTable="N" parentTypeId=""  
> roleTypeId="AGENT"/>
>     <RoleType description="Automated Agent" hasTable="N"  
> parentTypeId="" roleTypeId="AUTOMATED_AGENT_ROLE"/>
> @@ -236,7 +237,12 @@
>     <PartyClassificationType description="Trade" hasTable="N"  
> parentTypeId="" partyClassificationTypeId="TRADE_CLASSIFICATION"/>
>     <PartyClassificationType description="Wholesale" hasTable="N"  
> parentTypeId="TRADE_CLASSIFICATION"  
> partyClassificationTypeId="TRADE_WHOLE_CLASSIFI"/>
>     <PartyClassificationType description="Retail" hasTable="N"  
> parentTypeId="TRADE_CLASSIFICATION"  
> partyClassificationTypeId="TRADE_RETAIL_CLASSIF"/>
> -
> +    <PartyClassificationType description="Annual Revenue"  
> hasTable="N" parentTypeId=""  
> partyClassificationTypeId="ANNUAL_REVENUE"/>
> +    <PartyClassificationType description="Number of Employees"  
> hasTable="N" parentTypeId=""  
> partyClassificationTypeId="NUMBER_OF_EMPLOYEES"/>
> +    <PartyClassificationType description="Value Rating"  
> hasTable="N" parentTypeId=""  
> partyClassificationTypeId="VALUE_RATING"/>
> +    <PartyClassificationType description="SIC Code" hasTable="N"  
> parentTypeId="" partyClassificationTypeId="SIC_CODE"/>
> +    <PartyClassificationType description="Ownership" hasTable="N"  
> parentTypeId="" partyClassificationTypeId="OWNERSHIP"/>
> +
>     <PartyQualType description="Work experience" hasTable="N"  
> parentTypeId="" partyQualTypeId="EXPERIENCE"/>
>     <PartyQualType description="Certification" hasTable="N"  
> parentTypeId="" partyQualTypeId="CERTIFICATION"/>
>     <PartyQualType description="Degree" hasTable="N" parentTypeId=""  
> partyQualTypeId="DEGREE"/>
> @@ -259,7 +265,12 @@
>     <PartyRelationshipType description="" hasTable="N"  
> parentTypeId="" partyRelationshipName="Spouse"  
> partyRelationshipTypeId="SPOUSE" roleTypeIdValidFrom=""  
> roleTypeIdValidTo=""/>
>     <PartyRelationshipType description="" hasTable="N"  
> parentTypeId="" partyRelationshipName="Supplier"  
> partyRelationshipTypeId="SUPPLIER_REL" roleTypeIdValidFrom=""  
> roleTypeIdValidTo=""/>
>     <PartyRelationshipType description="" hasTable="N"  
> parentTypeId="" partyRelationshipName="Web Master"  
> partyRelationshipTypeId="WEB_MASTER_ASSIGNMEN"  
> roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
> -
> +    <PartyRelationshipType description="" hasTable="N"  
> parentTypeId="" partyRelationshipName="Account"  
> partyRelationshipTypeId="ACCOUNT" roleTypeIdValidFrom=""  
> roleTypeIdValidTo=""/>
> +    <PartyRelationshipType description="" hasTable="N"  
> parentTypeId="" partyRelationshipName="Assistant"  
> partyRelationshipTypeId="ASSISTANT" roleTypeIdValidFrom=""  
> roleTypeIdValidTo=""/>
> +    <PartyRelationshipType description="" hasTable="N"  
> parentTypeId="" partyRelationshipName="Owner"  
> partyRelationshipTypeId="OWNER" roleTypeIdValidFrom=""  
> roleTypeIdValidTo=""/>
> +    <PartyRelationshipType description="" hasTable="N"  
> parentTypeId="" partyRelationshipName="Parent Account"  
> partyRelationshipTypeId="PARENT_ACCOUNT" roleTypeIdValidFrom=""  
> roleTypeIdValidTo=""/>
> +    <PartyRelationshipType description="" hasTable="N"  
> parentTypeId="" partyRelationshipName="Reports To"  
> partyRelationshipTypeId="REPORTS_TO" roleTypeIdValidFrom=""  
> roleTypeIdValidTo=""/>
> +
>     <PartyType description="Automated Agent" hasTable="N"  
> parentTypeId="" partyTypeId="AUTOMATED_AGENT"/>
>     <PartyType description="Person" hasTable="Y" parentTypeId=""  
> partyTypeId="PERSON"/>
>     <PartyType description="Party Group" hasTable="Y"  
> parentTypeId="" partyTypeId="PARTY_GROUP"/>
>
> Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/party/entitydef/entitymodel.xml  
> (original)
> +++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Thu Feb  
> 28 07:55:59 2008
> @@ -1430,6 +1430,8 @@
>       <field name="createdByUserLogin" type="id-vlong"></field>
>       <field name="lastModifiedDate" type="date-time"></field>
>       <field name="lastModifiedByUserLogin" type="id-vlong"></field>
> +      <field name="dataSourceId" type="id"></field>
> +      <field name="isUnread" type="indicator"></field>
>       <prim-key field="partyId"/>
>       <relation type="one" fk-name="PARTY_PTY_TYP" rel-entity-
> name="PartyType">
>         <key-map field-name="partyTypeId"/>
> @@ -1449,6 +1451,9 @@
>       <relation type="many" rel-entity-name="PartyTypeAttr">
>         <key-map field-name="partyTypeId"/>
>       </relation>
> +      <relation type="one" fk-name="PARTY_DATSRC" rel-entity-
> name="DataSource">
> +        <key-map field-name="dataSourceId"/>
> +      </relation>
>       <index name="PARTYEXT_ID_IDX">
>         <index-field name="externalId"/>
>       </index>
> @@ -1799,6 +1804,9 @@
>       <field name="groupName" type="name"></field>
>       <field name="groupNameLocal" type="name"></field>
>       <field name="officeSiteName" type="name"></field>
> +      <field name="annualRevenue" type="currency-amount"></field>
> +      <field name="numEmployees" type="numeric"></field>
> +      <field name="tickerSymbol" type="id-ne"></field>
>       <field name="comments" type="comment"></field>
>       <field name="logoImageUrl" type="url"></field>
>       <prim-key field="partyId"/>
> @@ -1975,6 +1983,8 @@
>       <field name="securityGroupId" type="id-ne"></field>
>       <field name="priorityTypeId" type="id"></field>
>       <field name="partyRelationshipTypeId" type="id"></field>
> +      <field name="permissionsEnumId" type="id-ne"></field>
> +      <field name="positionTitle" type="name"><description>The  
> exact word used within the company</description></field>
>       <field name="comments" type="comment"></field>
>       <prim-key field="partyIdFrom"/>
>       <prim-key field="partyIdTo"/>
> @@ -2276,7 +2286,9 @@
>       <field name="suffix" type="name"></field>
>       <field name="nickname" type="name"></field>
>       <field name="firstNameLocal" type="name"></field>
> +      <field name="middleNameLocal" type="name"></field>
>       <field name="lastNameLocal" type="name"></field>
> +      <field name="otherLocal" type="name"></field>
>       <field name="memberId" type="id"></field>
>       <field name="gender" type="indicator"></field>
>       <field name="birthDate" type="date"></field>
>
> Modified: ofbiz/trunk/applications/workeffort/entitydef/
> entitymodel.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml  
> (original)
> +++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml  
> Thu Feb 28 07:55:59 2008
> @@ -247,6 +247,8 @@
>       <field name="priority" type="numeric"></field>
>       <field name="percentComplete" type="numeric"></field>
>       <field name="workEffortName" type="name"></field>
> +      <field name="showAsEnumId" type="id"></field>
> +      <field name="sendNotificationEmail" type="indicator"></field>
>       <field name="description" type="description"></field>
>       <field name="locationDesc" type="description"></field>
>       <field name="estimatedStartDate" type="date-time"></field>
>
>

[Vikas Mayur-2]

Thanks David for reviewing this commit.
I have done your suggested changes in rev 632241.

Vikas

On Thu, Feb 28, 2008 at 9:44 PM, David E Jones <
[hidden email]> wrote:

>
> These look good based on my limited memory of the analysis I did on
> this way back when. Thanks for your work on these Vikas, Jyotsna, and
> Saurabh.
>
> A few of the types need some fixing up, including:
>
> tickerSymbol should be "very-short" instead of "id-ne"
> numSent should be "numeric"
> expectedResponsePercent should be "floating-point"
>
> -David
>
>
> On Feb 28, 2008, at 8:56 AM, [hidden email] wrote:
>
> > Author: mor
> > Date: Thu Feb 28 07:55:59 2008
> > New Revision: 632034
> >
> > URL: http://svn.apache.org/viewvc?rev=632034&view=rev
> > Log:
> > Applied patch from Jira Issue OFBIZ-1686 (
> https://issues.apache.org/jira/browse/OFBIZ-1686
> > )
> > Added new Entity definations for SalesOpportunityTrackingCode,
> > SalesOpportunityCompetitor
> > with modifications to other entities for SFA component
> >
> > Thanks to Jyotsna Rathore, Saurabh Nayak for the patch.
> >
> > Modified:
> >    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
> >    ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml
> >    ofbiz/trunk/applications/order/entitydef/entitygroup.xml
> >    ofbiz/trunk/applications/order/entitydef/entitymodel.xml
> >    ofbiz/trunk/applications/party/data/PartyTypeData.xml
> >    ofbiz/trunk/applications/party/entitydef/entitymodel.xml
> >    ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
> >
> > Modified: ofbiz/trunk/applications/accounting/entitydef/
> > entitymodel.xml
> > URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > ======================================================================
> > --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
> > (original)
> > +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
> > Thu Feb 28 07:55:59 2008
> > @@ -1121,6 +1121,7 @@
> >       <field name="taxAuthPartyId" type="id-ne"/>
> >       <field name="taxAuthGeoId" type="id-ne"/>
> >       <field name="taxAuthorityRateSeqId" type="id-ne"></field>
> > +      <field name="salesOpportunityId" type="id-ne"></field>
> >       <prim-key field="invoiceId"/>
> >       <prim-key field="invoiceItemSeqId"/>
> >       <relation type="one" fk-name="INVOICE_ITMITYP" rel-entity-
> > name="InvoiceItemType">
> > @@ -1166,6 +1167,9 @@
> >       </relation>
> >       <relation type="one" fk-name="INVCE_ITM_OVRPTY"
> > title="OverrideOrg" rel-entity-name="Party">
> >         <key-map field-name="overrideOrgPartyId" rel-field-
> > name="partyId"/>
> > +      </relation>
> > +      <relation type="one" fk-name="INVCE_ITM_SLSOPP" rel-entity-
> > name="SalesOpportunity" >
> > +            <key-map field-name="salesOpportunityId"/>
> >       </relation>
> >     </entity>
> >     <entity entity-name="InvoiceItemAttribute"
> >
> > Modified: ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml
> > URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > ======================================================================
> > --- ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml
> > (original)
> > +++ ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml Thu
> > Feb 28 07:55:59 2008
> > @@ -57,6 +57,14 @@
> >       <field name="currencyUomId" type="id-ne"></field>
> >       <field name="fromDate" type="date-time"></field>
> >       <field name="thruDate" type="date-time"></field>
> > +      <field name="isActive" type="indicator"></field>
> > +      <field name="convertedLeads" type="id-ne"></field>
> > +      <field name="expectedResponsePercent" type="id-ne"></field>
> > +      <field name="expectedRevenue" type="currency-amount"></field>
> > +      <field name="numSent" type="id-ne"></field>
> > +       <field name="startDate" type="date-time"></field>
> > +      <field name="createdByUserLogin" type="id-vlong"></field>
> > +      <field name="lastModifiedByUserLogin" type="id-vlong"></field>
> >       <prim-key field="marketingCampaignId"/>
> >       <relation type="one" fk-name="MKTGCPN_PRNT" title="Parent" rel-
> > entity-name="MarketingCampaign">
> >         <key-map field-name="parentCampaignId" rel-field-
> > name="marketingCampaignId"/>
> >
> > Modified: ofbiz/trunk/applications/order/entitydef/entitygroup.xml
> > URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitygroup.xml?rev=632034&r1=632033&r2=632034&view=diff
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > ======================================================================
> > --- ofbiz/trunk/applications/order/entitydef/entitygroup.xml
> > (original)
> > +++ ofbiz/trunk/applications/order/entitydef/entitygroup.xml Thu Feb
> > 28 07:55:59 2008
> > @@ -198,11 +198,13 @@
> >     <!-- ========================================================= -->
> >
> >     <entity-group group="org.ofbiz" entity="SalesOpportunity" />
> > +    <entity-group group="org.ofbiz"
> > entity="SalesOpportunityCompetitor" />
> >     <entity-group group="org.ofbiz"
> > entity="SalesOpportunityHistory" />
> >     <entity-group group="org.ofbiz" entity="SalesOpportunityRole" />
> >     <entity-group group="org.ofbiz" entity="SalesOpportunityStage" />
> >     <entity-group group="org.ofbiz"
> > entity="SalesOpportunityWorkEffort" />
> >     <entity-group group="org.ofbiz" entity="SalesOpportunityQuote" />
> > +    <entity-group group="org.ofbiz"
> > entity="SalesOpportunityTrackingCode" />
> >     <entity-group group="org.ofbiz" entity="SalesForecast" />
> >     <entity-group group="org.ofbiz" entity="SalesForecastHistory" />
> >     <entity-group group="org.ofbiz"
> > entity="SalesForecastAndCustomTimePeriod" />
> >
> > Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml
> > URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > ======================================================================
> > --- ofbiz/trunk/applications/order/entitydef/entitymodel.xml
> > (original)
> > +++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Thu Feb
> > 28 07:55:59 2008
> > @@ -475,6 +475,7 @@
> >       <field name="shipBeforeDate" type="date-time"></field>
> >       <field name="shipAfterDate" type="date-time"></field>
> >       <field name="overrideGlAccountId" type="id"><!-- used to
> > specify the override or actual glAccountId used for the adjustment,
> > avoids problems if configuration changes after initial posting, etc
> > --></field>
> > +      <field name="salesOpportunityId" type="id-ne"></field>
> >       <prim-key field="orderId"/>
> >       <prim-key field="orderItemSeqId"/>
> >       <relation type="one" fk-name="ORDER_ITEM_HDR" rel-entity-
> > name="OrderHeader">
> > @@ -521,6 +522,9 @@
> >       <relation type="one" fk-name="ORDER_ITEM_OGLA"
> > title="Override" rel-entity-name="GlAccount">
> >         <key-map field-name="overrideGlAccountId" rel-field-
> > name="glAccountId"/>
> >       </relation>
> > +      <relation type="one" fk-name="ORDER_ITEM_SLSOPP" rel-entity-
> > name="SalesOpportunity" >
> > +            <key-map field-name="salesOpportunityId"/>
> > +      </relation>
> >       <index name="ORDITMEXT_ID_IDX">
> >         <index-field name="externalId"/>
> >       </index>
> > @@ -1583,6 +1587,11 @@
> >               Field to support a location of a cust request--ie,
> > product literature sent to an address, service call at a localtion,
> > etc.
> >           </description>
> >       </field>
> > +      <field name="currencyUomId" type="id"></field>
> > +      <field name="openDateTime" type="date-time"></field>
> > +      <field name="closedDateTime" type="date-time"></field>
> > +      <field name="internalComment" type="comment"></field>
> > +      <field name="reason" type="description"></field>
> >       <field name="createdDate" type="date-time"></field>
> >       <field name="createdByUserLogin" type="id-vlong"></field>
> >       <field name="lastModifiedDate" type="date-time"></field>
> > @@ -1615,6 +1624,9 @@
> >       <relation type="one" fk-name="CUST_REQ_FULCM" title="Fulfill"
> > rel-entity-name="ContactMech">
> >           <key-map field-name="fulfillContactMechId" rel-field-
> > name="contactMechId"/>
> >       </relation>
> > +      <relation type="one" fk-name="CUST_REQ_CUOM" rel-entity-
> > name="Uom">
> > +            <key-map field-name="currencyUomId" rel-field-
> > name="uomId"/>
> > +      </relation>
> >     </entity>
> >     <entity entity-name="CustRequestAttribute"
> >             package-name="org.ofbiz.order.request"
> > @@ -2798,6 +2810,7 @@
> >         <field name="closedAmount" type="currency-amount"/>
> >         <field name="percentOfQuotaForecast" type="floating-point"/>
> >         <field name="percentOfQuotaClosed" type="floating-point"/>
> > +        <field name="pipelineAmount" type="currency-amount"></field>
> >         <field name="createdByUserLoginId" type="id-vlong"></field>
> >         <field name="modifiedByUserLoginId" type="id-vlong"></field>
> >         <prim-key field="salesForecastId"/>
> > @@ -2863,6 +2876,32 @@
> >         </relation>
> >         <relation type="one" fk-name="SALES4CH_MOD_USER"
> > title="ModifiedBy" rel-entity-name="UserLogin">
> >             <key-map field-name="modifiedByUserLoginId" rel-field-
> > name="userLoginId"/>
> > +        </relation>
> > +    </entity>
> > +    <entity entity-name="SalesOpportunityCompetitor"
> > +            package-name="org.ofbiz.order.opportunity"
> > +            title="Sales opportunity competitors record">
> > +        <field name="salesOpportunityId" type="id-ne"></field>
> > +        <field name="competitorPartyId" type="id-ne"></field>
> > +        <field name="positionEnumId" type="id-ne"></field>
> > +        <field name="strengths" type="very-long"></field>
> > +        <field name="weaknesses" type="very-long"></field>
> > +        <prim-key field="salesOpportunityId"/>
> > +        <prim-key field="competitorPartyId"/>
> > +        <relation type="one" fk-name="SOPPCOMP_SOPP" rel-entity-
> > name="SalesOpportunity">
> > +            <key-map field-name="salesOpportunityId"/>
> > +        </relation>
> > +    </entity>
> > +    <entity entity-name="SalesOpportunityTrackingCode"
> > +            package-name="org.ofbiz.order.opportunity"
> > +            title="Sales opportunity traking code">
> > +        <field name="salesOpportunityId" type="id-ne"></field>
> > +        <field name="trackingCodeId" type="id-ne"></field>
> > +        <field name="receivedDate" type="date-time"></field>
> > +        <prim-key field="salesOpportunityId"/>
> > +        <prim-key field="trackingCodeId"/>
> > +        <relation type="one" fk-name="SOPPTRKCD_SOPP" rel-entity-
> > name="SalesOpportunity">
> > +            <key-map field-name="salesOpportunityId"/>
> >         </relation>
> >     </entity>
> >
> >
> > Modified: ofbiz/trunk/applications/party/data/PartyTypeData.xml
> > URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyTypeData.xml?rev=632034&r1=632033&r2=632034&view=diff
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > ======================================================================
> > --- ofbiz/trunk/applications/party/data/PartyTypeData.xml (original)
> > +++ ofbiz/trunk/applications/party/data/PartyTypeData.xml Thu Feb 28
> > 07:55:59 2008
> > @@ -144,6 +144,7 @@
> >     <Enumeration description="Party Invitation Email"
> > enumCode="INVITE_EMAIL" enumId="PRDS_PARTYINV_EMAIL" sequenceId="04"
> > enumTypeId="PARTY_EMAIL"/>
> >
> >     <!-- top level role types -->
> > +    <RoleType description="Account" hasTable="N" parentTypeId=""
> > roleTypeId="ACCOUNT"/>
> >     <RoleType description="Administrator" hasTable="N"
> > parentTypeId="" roleTypeId="ADMIN"/>
> >     <RoleType description="Agent" hasTable="N" parentTypeId=""
> > roleTypeId="AGENT"/>
> >     <RoleType description="Automated Agent" hasTable="N"
> > parentTypeId="" roleTypeId="AUTOMATED_AGENT_ROLE"/>
> > @@ -236,7 +237,12 @@
> >     <PartyClassificationType description="Trade" hasTable="N"
> > parentTypeId="" partyClassificationTypeId="TRADE_CLASSIFICATION"/>
> >     <PartyClassificationType description="Wholesale" hasTable="N"
> > parentTypeId="TRADE_CLASSIFICATION"
> > partyClassificationTypeId="TRADE_WHOLE_CLASSIFI"/>
> >     <PartyClassificationType description="Retail" hasTable="N"
> > parentTypeId="TRADE_CLASSIFICATION"
> > partyClassificationTypeId="TRADE_RETAIL_CLASSIF"/>
> > -
> > +    <PartyClassificationType description="Annual Revenue"
> > hasTable="N" parentTypeId=""
> > partyClassificationTypeId="ANNUAL_REVENUE"/>
> > +    <PartyClassificationType description="Number of Employees"
> > hasTable="N" parentTypeId=""
> > partyClassificationTypeId="NUMBER_OF_EMPLOYEES"/>
> > +    <PartyClassificationType description="Value Rating"
> > hasTable="N" parentTypeId=""
> > partyClassificationTypeId="VALUE_RATING"/>
> > +    <PartyClassificationType description="SIC Code" hasTable="N"
> > parentTypeId="" partyClassificationTypeId="SIC_CODE"/>
> > +    <PartyClassificationType description="Ownership" hasTable="N"
> > parentTypeId="" partyClassificationTypeId="OWNERSHIP"/>
> > +
> >     <PartyQualType description="Work experience" hasTable="N"
> > parentTypeId="" partyQualTypeId="EXPERIENCE"/>
> >     <PartyQualType description="Certification" hasTable="N"
> > parentTypeId="" partyQualTypeId="CERTIFICATION"/>
> >     <PartyQualType description="Degree" hasTable="N" parentTypeId=""
> > partyQualTypeId="DEGREE"/>
> > @@ -259,7 +265,12 @@
> >     <PartyRelationshipType description="" hasTable="N"
> > parentTypeId="" partyRelationshipName="Spouse"
> > partyRelationshipTypeId="SPOUSE" roleTypeIdValidFrom=""
> > roleTypeIdValidTo=""/>
> >     <PartyRelationshipType description="" hasTable="N"
> > parentTypeId="" partyRelationshipName="Supplier"
> > partyRelationshipTypeId="SUPPLIER_REL" roleTypeIdValidFrom=""
> > roleTypeIdValidTo=""/>
> >     <PartyRelationshipType description="" hasTable="N"
> > parentTypeId="" partyRelationshipName="Web Master"
> > partyRelationshipTypeId="WEB_MASTER_ASSIGNMEN"
> > roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
> > -
> > +    <PartyRelationshipType description="" hasTable="N"
> > parentTypeId="" partyRelationshipName="Account"
> > partyRelationshipTypeId="ACCOUNT" roleTypeIdValidFrom=""
> > roleTypeIdValidTo=""/>
> > +    <PartyRelationshipType description="" hasTable="N"
> > parentTypeId="" partyRelationshipName="Assistant"
> > partyRelationshipTypeId="ASSISTANT" roleTypeIdValidFrom=""
> > roleTypeIdValidTo=""/>
> > +    <PartyRelationshipType description="" hasTable="N"
> > parentTypeId="" partyRelationshipName="Owner"
> > partyRelationshipTypeId="OWNER" roleTypeIdValidFrom=""
> > roleTypeIdValidTo=""/>
> > +    <PartyRelationshipType description="" hasTable="N"
> > parentTypeId="" partyRelationshipName="Parent Account"
> > partyRelationshipTypeId="PARENT_ACCOUNT" roleTypeIdValidFrom=""
> > roleTypeIdValidTo=""/>
> > +    <PartyRelationshipType description="" hasTable="N"
> > parentTypeId="" partyRelationshipName="Reports To"
> > partyRelationshipTypeId="REPORTS_TO" roleTypeIdValidFrom=""
> > roleTypeIdValidTo=""/>
> > +
> >     <PartyType description="Automated Agent" hasTable="N"
> > parentTypeId="" partyTypeId="AUTOMATED_AGENT"/>
> >     <PartyType description="Person" hasTable="Y" parentTypeId=""
> > partyTypeId="PERSON"/>
> >     <PartyType description="Party Group" hasTable="Y"
> > parentTypeId="" partyTypeId="PARTY_GROUP"/>
> >
> > Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
> > URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > ======================================================================
> > --- ofbiz/trunk/applications/party/entitydef/entitymodel.xml
> > (original)
> > +++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Thu Feb
> > 28 07:55:59 2008
> > @@ -1430,6 +1430,8 @@
> >       <field name="createdByUserLogin" type="id-vlong"></field>
> >       <field name="lastModifiedDate" type="date-time"></field>
> >       <field name="lastModifiedByUserLogin" type="id-vlong"></field>
> > +      <field name="dataSourceId" type="id"></field>
> > +      <field name="isUnread" type="indicator"></field>
> >       <prim-key field="partyId"/>
> >       <relation type="one" fk-name="PARTY_PTY_TYP" rel-entity-
> > name="PartyType">
> >         <key-map field-name="partyTypeId"/>
> > @@ -1449,6 +1451,9 @@
> >       <relation type="many" rel-entity-name="PartyTypeAttr">
> >         <key-map field-name="partyTypeId"/>
> >       </relation>
> > +      <relation type="one" fk-name="PARTY_DATSRC" rel-entity-
> > name="DataSource">
> > +        <key-map field-name="dataSourceId"/>
> > +      </relation>
> >       <index name="PARTYEXT_ID_IDX">
> >         <index-field name="externalId"/>
> >       </index>
> > @@ -1799,6 +1804,9 @@
> >       <field name="groupName" type="name"></field>
> >       <field name="groupNameLocal" type="name"></field>
> >       <field name="officeSiteName" type="name"></field>
> > +      <field name="annualRevenue" type="currency-amount"></field>
> > +      <field name="numEmployees" type="numeric"></field>
> > +      <field name="tickerSymbol" type="id-ne"></field>
> >       <field name="comments" type="comment"></field>
> >       <field name="logoImageUrl" type="url"></field>
> >       <prim-key field="partyId"/>
> > @@ -1975,6 +1983,8 @@
> >       <field name="securityGroupId" type="id-ne"></field>
> >       <field name="priorityTypeId" type="id"></field>
> >       <field name="partyRelationshipTypeId" type="id"></field>
> > +      <field name="permissionsEnumId" type="id-ne"></field>
> > +      <field name="positionTitle" type="name"><description>The
> > exact word used within the company</description></field>
> >       <field name="comments" type="comment"></field>
> >       <prim-key field="partyIdFrom"/>
> >       <prim-key field="partyIdTo"/>
> > @@ -2276,7 +2286,9 @@
> >       <field name="suffix" type="name"></field>
> >       <field name="nickname" type="name"></field>
> >       <field name="firstNameLocal" type="name"></field>
> > +      <field name="middleNameLocal" type="name"></field>
> >       <field name="lastNameLocal" type="name"></field>
> > +      <field name="otherLocal" type="name"></field>
> >       <field name="memberId" type="id"></field>
> >       <field name="gender" type="indicator"></field>
> >       <field name="birthDate" type="date"></field>
> >
> > Modified: ofbiz/trunk/applications/workeffort/entitydef/
> > entitymodel.xml
> > URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=632034&r1=632033&r2=632034&view=diff
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > ======================================================================
> > --- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
> > (original)
> > +++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
> > Thu Feb 28 07:55:59 2008
> > @@ -247,6 +247,8 @@
> >       <field name="priority" type="numeric"></field>
> >       <field name="percentComplete" type="numeric"></field>
> >       <field name="workEffortName" type="name"></field>
> > +      <field name="showAsEnumId" type="id"></field>
> > +      <field name="sendNotificationEmail" type="indicator"></field>
> >       <field name="description" type="description"></field>
> >       <field name="locationDesc" type="description"></field>
> >       <field name="estimatedStartDate" type="date-time"></field>
> >
> >
>
>