svn commit: r1805965 - /ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1805965 - /ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml

nmalin
Author: nmalin
Date: Wed Aug 23 21:39:24 2017
New Revision: 1805965

URL: http://svn.apache.org/viewvc?rev=1805965&view=rev
Log:
Fixed: No functional change, after the issue OFBIZ-9550, clean (second pass) marketing-entitymodel.xml file to realign correctly the file format (only withspaces changed on this commit)

Modified:
    ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml?rev=1805965&r1=1805964&r2=1805965&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml Wed Aug 23 21:39:24 2017
@@ -19,184 +19,183 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
-  <!-- ========================================================= -->
-  <!-- ======================== Defaults ======================= -->
-  <!-- ========================================================= -->
+             xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    <!-- ========================================================= -->
+    <!-- ======================== Defaults ======================= -->
+    <!-- ========================================================= -->
     <title>Entity of an Apache OFBiz Component</title>
     <description>None</description>
     <version>1.0</version>
 
-  <!-- ========================================================= -->
-  <!-- ======================== Data Model ===================== -->
-  <!-- The modules in this file are as follows:                  -->
-  <!--  - org.apache.ofbiz.marketing.campaign -->
-  <!--  - org.apache.ofbiz.marketing.contact -->
-  <!--  - org.apache.ofbiz.marketing.segment -->
-  <!--  - org.apache.ofbiz.marketing.tracking -->
-  <!--  - org.apache.ofbiz.marketing.opportunity -->
-  <!-- ========================================================= -->
-
+    <!-- ========================================================= -->
+    <!-- ======================== Data Model ===================== -->
+    <!-- The modules in this file are as follows:                  -->
+    <!--  - org.apache.ofbiz.marketing.campaign -->
+    <!--  - org.apache.ofbiz.marketing.contact -->
+    <!--  - org.apache.ofbiz.marketing.segment -->
+    <!--  - org.apache.ofbiz.marketing.tracking -->
+    <!--  - org.apache.ofbiz.marketing.opportunity -->
+    <!-- ========================================================= -->
 
-  <!-- ========================================================= -->
-  <!-- org.apache.ofbiz.marketing.campaign -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.apache.ofbiz.marketing.campaign -->
+    <!-- ========================================================= -->
 
     <entity entity-name="MarketingCampaign"
             package-name="org.apache.ofbiz.marketing.campaign"
             title="Marketing Campaign Entity">
-      <field name="marketingCampaignId" type="id"/>
-      <field name="parentCampaignId" type="id"/>
-      <field name="statusId" type="id"/>
-      <field name="campaignName" type="name"/>
-      <field name="campaignSummary" type="very-long"/>
-      <field name="budgetedCost" type="currency-amount"/>
-      <field name="actualCost" type="currency-amount"/>
-      <field name="estimatedCost" type="currency-amount"/>
-      <field name="currencyUomId" type="id"/>
-      <field name="fromDate" type="date-time"/>
-      <field name="thruDate" type="date-time"/>
-      <field name="isActive" type="indicator"/>
-      <field name="convertedLeads" type="id"/>
-      <field name="expectedResponsePercent" type="floating-point"/>
-      <field name="expectedRevenue" type="currency-amount"/>
-      <field name="numSent" type="numeric"/>
-      <field name="startDate" type="date-time"/>
-      <field name="createdByUserLogin" type="id-vlong"/>
-      <field name="lastModifiedByUserLogin" type="id-vlong"/>
-      <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"/>
-      </relation>
-      <relation type="one" fk-name="MKTGCPN_STS" rel-entity-name="StatusItem">
-        <key-map field-name="statusId"/>
-      </relation>
-      <relation type="one" fk-name="MKTGCPN_CUOM" rel-entity-name="Uom">
-        <key-map field-name="currencyUomId" rel-field-name="uomId"/>
-      </relation>
+        <field name="marketingCampaignId" type="id"/>
+        <field name="parentCampaignId" type="id"/>
+        <field name="statusId" type="id"/>
+        <field name="campaignName" type="name"/>
+        <field name="campaignSummary" type="very-long"/>
+        <field name="budgetedCost" type="currency-amount"/>
+        <field name="actualCost" type="currency-amount"/>
+        <field name="estimatedCost" type="currency-amount"/>
+        <field name="currencyUomId" type="id"/>
+        <field name="fromDate" type="date-time"/>
+        <field name="thruDate" type="date-time"/>
+        <field name="isActive" type="indicator"/>
+        <field name="convertedLeads" type="id"/>
+        <field name="expectedResponsePercent" type="floating-point"/>
+        <field name="expectedRevenue" type="currency-amount"/>
+        <field name="numSent" type="numeric"/>
+        <field name="startDate" type="date-time"/>
+        <field name="createdByUserLogin" type="id-vlong"/>
+        <field name="lastModifiedByUserLogin" type="id-vlong"/>
+        <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"/>
+        </relation>
+        <relation type="one" fk-name="MKTGCPN_STS" rel-entity-name="StatusItem">
+            <key-map field-name="statusId"/>
+        </relation>
+        <relation type="one" fk-name="MKTGCPN_CUOM" rel-entity-name="Uom">
+            <key-map field-name="currencyUomId" rel-field-name="uomId"/>
+        </relation>
     </entity>
     <entity entity-name="MarketingCampaignNote"
             package-name="org.apache.ofbiz.marketing.campaign"
             title="Marketing Campaign Note Entity">
-      <field name="marketingCampaignId" type="id"/>
-      <field name="noteId" type="id"/>
-      <prim-key field="marketingCampaignId"/>
-      <prim-key field="noteId"/>
-      <relation type="one" fk-name="MKTGCPN_NOTE_CMPN" rel-entity-name="MarketingCampaign">
-        <key-map field-name="marketingCampaignId"/>
-      </relation>
-      <relation type="one" fk-name="MKTGCPN_NOTE_NOTE" rel-entity-name="NoteData">
-        <key-map field-name="noteId"/>
-      </relation>
+        <field name="marketingCampaignId" type="id"/>
+        <field name="noteId" type="id"/>
+        <prim-key field="marketingCampaignId"/>
+        <prim-key field="noteId"/>
+        <relation type="one" fk-name="MKTGCPN_NOTE_CMPN" rel-entity-name="MarketingCampaign">
+            <key-map field-name="marketingCampaignId"/>
+        </relation>
+        <relation type="one" fk-name="MKTGCPN_NOTE_NOTE" rel-entity-name="NoteData">
+            <key-map field-name="noteId"/>
+        </relation>
     </entity>
     <entity entity-name="MarketingCampaignPrice"
             package-name="org.apache.ofbiz.marketing.campaign"
             title="Marketing Campaign Price Entity">
-      <field name="marketingCampaignId" type="id"/>
-      <field name="productPriceRuleId" type="id"/>
-      <field name="fromDate" type="date-time"/>
-      <field name="thruDate" type="date-time"/>
-      <prim-key field="marketingCampaignId"/>
-      <prim-key field="productPriceRuleId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="MKTGCPN_PRICE_MC" rel-entity-name="MarketingCampaign">
-        <key-map field-name="marketingCampaignId"/>
-      </relation>
-      <relation type="one" fk-name="MKTGCPN_PRICE_PP" rel-entity-name="ProductPriceRule">
-        <key-map field-name="productPriceRuleId"/>
-      </relation>
+        <field name="marketingCampaignId" type="id"/>
+        <field name="productPriceRuleId" type="id"/>
+        <field name="fromDate" type="date-time"/>
+        <field name="thruDate" type="date-time"/>
+        <prim-key field="marketingCampaignId"/>
+        <prim-key field="productPriceRuleId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="MKTGCPN_PRICE_MC" rel-entity-name="MarketingCampaign">
+            <key-map field-name="marketingCampaignId"/>
+        </relation>
+        <relation type="one" fk-name="MKTGCPN_PRICE_PP" rel-entity-name="ProductPriceRule">
+            <key-map field-name="productPriceRuleId"/>
+        </relation>
     </entity>
     <entity entity-name="MarketingCampaignPromo"
             package-name="org.apache.ofbiz.marketing.campaign"
             title="Marketing Campaign Promo Entity">
-      <field name="marketingCampaignId" type="id"/>
-      <field name="productPromoId" type="id"/>
-      <field name="fromDate" type="date-time"/>
-      <field name="thruDate" type="date-time"/>
-      <prim-key field="marketingCampaignId"/>
-      <prim-key field="productPromoId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="MKTGCPN_PROMO_MC" rel-entity-name="MarketingCampaign">
-        <key-map field-name="marketingCampaignId"/>
-      </relation>
-      <relation type="one" fk-name="MKTGCPN_PROMO_PP" rel-entity-name="ProductPromo">
-        <key-map field-name="productPromoId"/>
-      </relation>
+        <field name="marketingCampaignId" type="id"/>
+        <field name="productPromoId" type="id"/>
+        <field name="fromDate" type="date-time"/>
+        <field name="thruDate" type="date-time"/>
+        <prim-key field="marketingCampaignId"/>
+        <prim-key field="productPromoId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="MKTGCPN_PROMO_MC" rel-entity-name="MarketingCampaign">
+            <key-map field-name="marketingCampaignId"/>
+        </relation>
+        <relation type="one" fk-name="MKTGCPN_PROMO_PP" rel-entity-name="ProductPromo">
+            <key-map field-name="productPromoId"/>
+        </relation>
     </entity>
     <entity entity-name="MarketingCampaignRole"
             package-name="org.apache.ofbiz.marketing.campaign"
             title="Marketing Campaign Role Entity">
-      <field name="marketingCampaignId" type="id"/>
-      <field name="partyId" type="id"/>
-      <field name="roleTypeId" type="id"/>
-      <field name="fromDate" type="date-time"/>
-      <field name="thruDate" type="date-time"/>
-      <prim-key field="marketingCampaignId"/>
-      <prim-key field="partyId"/>
-      <prim-key field="roleTypeId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="MKTGCPN_ROLE_MC" rel-entity-name="MarketingCampaign">
-        <key-map field-name="marketingCampaignId"/>
-      </relation>
-      <relation type="one" fk-name="MKTGCPN_ROLE_PR" rel-entity-name="PartyRole">
-        <key-map field-name="partyId"/>
-        <key-map field-name="roleTypeId"/>
-      </relation>
-      <relation type="one-nofk" rel-entity-name="Party">
-        <key-map field-name="partyId"/>
-      </relation>
-      <relation type="one-nofk" rel-entity-name="RoleType">
-        <key-map field-name="roleTypeId"/>
-      </relation>
-    </entity>
-
-  <!-- ========================================================= -->
-  <!-- org.apache.ofbiz.marketing.contact -->
-  <!-- ========================================================= -->
+        <field name="marketingCampaignId" type="id"/>
+        <field name="partyId" type="id"/>
+        <field name="roleTypeId" type="id"/>
+        <field name="fromDate" type="date-time"/>
+        <field name="thruDate" type="date-time"/>
+        <prim-key field="marketingCampaignId"/>
+        <prim-key field="partyId"/>
+        <prim-key field="roleTypeId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="MKTGCPN_ROLE_MC" rel-entity-name="MarketingCampaign">
+            <key-map field-name="marketingCampaignId"/>
+        </relation>
+        <relation type="one" fk-name="MKTGCPN_ROLE_PR" rel-entity-name="PartyRole">
+            <key-map field-name="partyId"/>
+            <key-map field-name="roleTypeId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="Party">
+            <key-map field-name="partyId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="RoleType">
+            <key-map field-name="roleTypeId"/>
+        </relation>
+    </entity>
+
+    <!-- ========================================================= -->
+    <!-- org.apache.ofbiz.marketing.contact -->
+    <!-- ========================================================= -->
 
     <entity entity-name="ContactList"
             package-name="org.apache.ofbiz.marketing.contact"
             title="Contact List Entity">
-      <field name="contactListId" type="id"/>
-      <field name="contactListTypeId" type="id"/>
-      <field name="contactMechTypeId" type="id"/>
-      <field name="marketingCampaignId" type="id"/>
-      <field name="contactListName" type="name"/>
-      <field name="description" type="description"/>
-      <field name="comments" type="comment"/>
-      <field name="isPublic" type="indicator"/>
-      <field name="singleUse" type="indicator"><description>Whether members of the list should be contacted only once.</description></field>
-      <field name="ownerPartyId" type="id"/>
-      <field name="verifyEmailFrom" type="long-varchar"/>
-      <field name="verifyEmailScreen" type="long-varchar"/>
-      <field name="verifyEmailSubject" type="long-varchar"/>
-      <field name="verifyEmailWebSiteId" type="id"/>
-      <field name="optOutScreen" type="long-varchar"/>
-      <field name="createdByUserLogin" type="id-vlong"/>
-      <field name="lastModifiedByUserLogin" type="id-vlong"/>
-      <prim-key field="contactListId"/>
-      <relation type="one" fk-name="CNCT_LST_MKCMPN" rel-entity-name="MarketingCampaign">
-        <key-map field-name="marketingCampaignId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LST_TYP" rel-entity-name="ContactListType">
-        <key-map field-name="contactListTypeId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LST_CMCHTP" rel-entity-name="ContactMechType">
-        <key-map field-name="contactMechTypeId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LST_CBUL" title="CreatedBy" rel-entity-name="UserLogin">
-        <key-map field-name="createdByUserLogin" rel-field-name="userLoginId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LST_LMUL" title="LastModifiedBy" rel-entity-name="UserLogin">
-        <key-map field-name="lastModifiedByUserLogin" rel-field-name="userLoginId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LST_OPTY" title="Owner" rel-entity-name="Party">
-        <key-map field-name="ownerPartyId" rel-field-name="partyId"/>
-      </relation>
+        <field name="contactListId" type="id"/>
+        <field name="contactListTypeId" type="id"/>
+        <field name="contactMechTypeId" type="id"/>
+        <field name="marketingCampaignId" type="id"/>
+        <field name="contactListName" type="name"/>
+        <field name="description" type="description"/>
+        <field name="comments" type="comment"/>
+        <field name="isPublic" type="indicator"/>
+        <field name="singleUse" type="indicator"><description>Whether members of the list should be contacted only once.</description></field>
+        <field name="ownerPartyId" type="id"/>
+        <field name="verifyEmailFrom" type="long-varchar"/>
+        <field name="verifyEmailScreen" type="long-varchar"/>
+        <field name="verifyEmailSubject" type="long-varchar"/>
+        <field name="verifyEmailWebSiteId" type="id"/>
+        <field name="optOutScreen" type="long-varchar"/>
+        <field name="createdByUserLogin" type="id-vlong"/>
+        <field name="lastModifiedByUserLogin" type="id-vlong"/>
+        <prim-key field="contactListId"/>
+        <relation type="one" fk-name="CNCT_LST_MKCMPN" rel-entity-name="MarketingCampaign">
+            <key-map field-name="marketingCampaignId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LST_TYP" rel-entity-name="ContactListType">
+            <key-map field-name="contactListTypeId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LST_CMCHTP" rel-entity-name="ContactMechType">
+            <key-map field-name="contactMechTypeId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LST_CBUL" title="CreatedBy" rel-entity-name="UserLogin">
+            <key-map field-name="createdByUserLogin" rel-field-name="userLoginId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LST_LMUL" title="LastModifiedBy" rel-entity-name="UserLogin">
+            <key-map field-name="lastModifiedByUserLogin" rel-field-name="userLoginId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LST_OPTY" title="Owner" rel-entity-name="Party">
+            <key-map field-name="ownerPartyId" rel-field-name="partyId"/>
+        </relation>
     </entity>
     <entity entity-name="WebSiteContactList"
-        package-name="org.apache.ofbiz.marketing.contact"
-        title="Web Site Contact List Entity">
+            package-name="org.apache.ofbiz.marketing.contact"
+            title="Web Site Contact List Entity">
         <field name="webSiteId" type="id"/>
         <field name="contactListId" type="id"/>
         <field name="fromDate" type="date-time"/>
@@ -214,65 +213,65 @@ under the License.
     <entity entity-name="ContactListCommStatus"
             package-name="org.apache.ofbiz.marketing.contact"
             title="Contact List Entity">
-      <field name="contactListId" type="id"/>
-      <field name="communicationEventId" type="id"/>
-      <field name="contactMechId" type="id"/>
-      <field name="partyId" type="id"/>
-      <field name="messageId" type="value"/>
-      <field name="statusId" type="id"/>
-      <field name="changeByUserLoginId" type="id-vlong"/>
-      <prim-key field="contactListId"/>
-      <prim-key field="communicationEventId"/>
-      <prim-key field="contactMechId"/>
-      <relation type="one" fk-name="CNCT_LST_CST_CL" rel-entity-name="ContactList">
-        <key-map field-name="contactListId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LST_CST_CE" rel-entity-name="CommunicationEvent">
-        <key-map field-name="communicationEventId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LST_CST_CM" rel-entity-name="ContactMech">
-        <key-map field-name="contactMechId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LST_CST_PT" rel-entity-name="Party">
-        <key-map field-name="partyId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LST_CST_ST" rel-entity-name="StatusItem">
-        <key-map field-name="statusId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LST_CST_ST_UL" title="ChangeBy" rel-entity-name="UserLogin">
-          <key-map field-name="changeByUserLoginId" rel-field-name="userLoginId"/>
-      </relation>
-      <index name="CNTLSTCST_MSG_ID" unique="true">
-        <index-field name="messageId"/>
-      </index>
+        <field name="contactListId" type="id"/>
+        <field name="communicationEventId" type="id"/>
+        <field name="contactMechId" type="id"/>
+        <field name="partyId" type="id"/>
+        <field name="messageId" type="value"/>
+        <field name="statusId" type="id"/>
+        <field name="changeByUserLoginId" type="id-vlong"/>
+        <prim-key field="contactListId"/>
+        <prim-key field="communicationEventId"/>
+        <prim-key field="contactMechId"/>
+        <relation type="one" fk-name="CNCT_LST_CST_CL" rel-entity-name="ContactList">
+            <key-map field-name="contactListId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LST_CST_CE" rel-entity-name="CommunicationEvent">
+            <key-map field-name="communicationEventId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LST_CST_CM" rel-entity-name="ContactMech">
+            <key-map field-name="contactMechId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LST_CST_PT" rel-entity-name="Party">
+            <key-map field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LST_CST_ST" rel-entity-name="StatusItem">
+            <key-map field-name="statusId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LST_CST_ST_UL" title="ChangeBy" rel-entity-name="UserLogin">
+            <key-map field-name="changeByUserLoginId" rel-field-name="userLoginId"/>
+        </relation>
+        <index name="CNTLSTCST_MSG_ID" unique="true">
+            <index-field name="messageId"/>
+        </index>
     </entity>
     <entity entity-name="ContactListParty"
             package-name="org.apache.ofbiz.marketing.contact"
             title="Contact List Party Entity">
-      <field name="contactListId" type="id"/>
-      <field name="partyId" type="id"/>
-      <field name="fromDate" type="date-time"/>
-      <field name="thruDate" type="date-time"/>
-      <field name="statusId" type="id"/>
-      <field name="preferredContactMechId" type="id"/>
-      <prim-key field="contactListId"/>
-      <prim-key field="partyId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="CNCT_LSTPTY_CLST" rel-entity-name="ContactList">
-        <key-map field-name="contactListId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LSTPTY_PTY" rel-entity-name="Party">
-        <key-map field-name="partyId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LSTPTY_STS" rel-entity-name="StatusItem">
-        <key-map field-name="statusId"/>
-      </relation>
-      <relation type="one" fk-name="CNCT_LSTPTY_PCM" title="Preferred" rel-entity-name="ContactMech">
-        <key-map field-name="preferredContactMechId" rel-field-name="contactMechId"/>
-      </relation>
+        <field name="contactListId" type="id"/>
+        <field name="partyId" type="id"/>
+        <field name="fromDate" type="date-time"/>
+        <field name="thruDate" type="date-time"/>
+        <field name="statusId" type="id"/>
+        <field name="preferredContactMechId" type="id"/>
+        <prim-key field="contactListId"/>
+        <prim-key field="partyId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="CNCT_LSTPTY_CLST" rel-entity-name="ContactList">
+            <key-map field-name="contactListId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LSTPTY_PTY" rel-entity-name="Party">
+            <key-map field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LSTPTY_STS" rel-entity-name="StatusItem">
+            <key-map field-name="statusId"/>
+        </relation>
+        <relation type="one" fk-name="CNCT_LSTPTY_PCM" title="Preferred" rel-entity-name="ContactMech">
+            <key-map field-name="preferredContactMechId" rel-field-name="contactMechId"/>
+        </relation>
     </entity>
     <view-entity entity-name="ContactListPartyAndStatus"
-        package-name="org.apache.ofbiz.marketing.contact">
+                 package-name="org.apache.ofbiz.marketing.contact">
         <member-entity entity-alias="CLPS" entity-name="ContactListPartyStatus"/>
         <member-entity entity-alias="SI" entity-name="StatusItem"/>
         <alias-all entity-alias="CLPS"/>
@@ -282,8 +281,8 @@ under the License.
         </view-link>
     </view-entity>
     <entity entity-name="ContactListPartyStatus"
-        package-name="org.apache.ofbiz.marketing.contact"
-        title="Contact List Party Status Entity">
+            package-name="org.apache.ofbiz.marketing.contact"
+            title="Contact List Party Status Entity">
         <field name="contactListId" type="id"/>
         <field name="partyId" type="id"/>
         <field name="fromDate" type="date-time"/>
@@ -305,9 +304,9 @@ under the License.
             package-name="org.apache.ofbiz.marketing.contact"
             default-resource-name="MarketingEntityLabels"
             title="Contact List Type Entity">
-      <field name="contactListTypeId" type="id"/>
-      <field name="description" type="description"/>
-      <prim-key field="contactListTypeId"/>
+        <field name="contactListTypeId" type="id"/>
+        <field name="description" type="description"/>
+        <prim-key field="contactListTypeId"/>
     </entity>
 
     <!-- ========================================================= -->
@@ -447,116 +446,116 @@ under the License.
     <entity entity-name="TrackingCode"
             package-name="org.apache.ofbiz.marketing.tracking"
             title="Tracking Code Entity">
-      <field name="trackingCodeId" type="id"/>
-      <field name="trackingCodeTypeId" type="id"/>
-      <field name="marketingCampaignId" type="id"/>
-      <field name="redirectUrl" type="url"/>
-      <field name="overrideLogo" type="url"/>
-      <field name="overrideCss" type="url"/>
-      <field name="prodCatalogId" type="id"/>
-      <field name="comments" type="comment"/>
-      <field name="description" type="description"/>
-      <field name="trackableLifetime" type="numeric"/>
-      <field name="billableLifetime" type="numeric"/>
-      <field name="fromDate" type="date-time"/>
-      <field name="thruDate" type="date-time"/>
-      <field name="groupId" type="id"/>
-      <field name="subgroupId" type="id"/>
-      <field name="createdDate" type="date-time"/>
-      <field name="createdByUserLogin" type="id-vlong"/>
-      <field name="lastModifiedDate" type="date-time"/>
-      <field name="lastModifiedByUserLogin" type="id-vlong"/>
-      <prim-key field="trackingCodeId"/>
-      <relation type="one" fk-name="TKNG_COD_MKCMPN" rel-entity-name="MarketingCampaign">
-        <key-map field-name="marketingCampaignId"/>
-      </relation>
-      <relation type="one" fk-name="TKNG_COD_TYP" rel-entity-name="TrackingCodeType">
-        <key-map field-name="trackingCodeTypeId"/>
-      </relation>
+        <field name="trackingCodeId" type="id"/>
+        <field name="trackingCodeTypeId" type="id"/>
+        <field name="marketingCampaignId" type="id"/>
+        <field name="redirectUrl" type="url"/>
+        <field name="overrideLogo" type="url"/>
+        <field name="overrideCss" type="url"/>
+        <field name="prodCatalogId" type="id"/>
+        <field name="comments" type="comment"/>
+        <field name="description" type="description"/>
+        <field name="trackableLifetime" type="numeric"/>
+        <field name="billableLifetime" type="numeric"/>
+        <field name="fromDate" type="date-time"/>
+        <field name="thruDate" type="date-time"/>
+        <field name="groupId" type="id"/>
+        <field name="subgroupId" type="id"/>
+        <field name="createdDate" type="date-time"/>
+        <field name="createdByUserLogin" type="id-vlong"/>
+        <field name="lastModifiedDate" type="date-time"/>
+        <field name="lastModifiedByUserLogin" type="id-vlong"/>
+        <prim-key field="trackingCodeId"/>
+        <relation type="one" fk-name="TKNG_COD_MKCMPN" rel-entity-name="MarketingCampaign">
+            <key-map field-name="marketingCampaignId"/>
+        </relation>
+        <relation type="one" fk-name="TKNG_COD_TYP" rel-entity-name="TrackingCodeType">
+            <key-map field-name="trackingCodeTypeId"/>
+        </relation>
     </entity>
     <entity entity-name="TrackingCodeOrder"
             package-name="org.apache.ofbiz.marketing.tracking"
             title="Tracking Code Visit Entity">
-      <field name="orderId" type="id"/>
-      <field name="trackingCodeTypeId" type="id"/>
-      <field name="trackingCodeId" type="id"/>
-      <field name="isBillable" type="indicator"/>
-      <field name="siteId" type="long-varchar"/>
-      <field name="hasExported" type="indicator"/>
-      <field name="affiliateReferredTimeStamp" type="date-time"/>
-      <prim-key field="orderId"/>
-      <prim-key field="trackingCodeTypeId"/>
-      <relation type="one" fk-name="TKNG_CODODR_ODR" rel-entity-name="OrderHeader">
-        <key-map field-name="orderId"/>
-      </relation>
-      <relation type="one" fk-name="TKNG_CODODR_TKCD" rel-entity-name="TrackingCode">
-        <key-map field-name="trackingCodeId"/>
-      </relation>
-      <relation type="one" fk-name="TKNG_CODODR_TYP" rel-entity-name="TrackingCodeType">
-        <key-map field-name="trackingCodeTypeId"/>
-      </relation>
+        <field name="orderId" type="id"/>
+        <field name="trackingCodeTypeId" type="id"/>
+        <field name="trackingCodeId" type="id"/>
+        <field name="isBillable" type="indicator"/>
+        <field name="siteId" type="long-varchar"/>
+        <field name="hasExported" type="indicator"/>
+        <field name="affiliateReferredTimeStamp" type="date-time"/>
+        <prim-key field="orderId"/>
+        <prim-key field="trackingCodeTypeId"/>
+        <relation type="one" fk-name="TKNG_CODODR_ODR" rel-entity-name="OrderHeader">
+            <key-map field-name="orderId"/>
+        </relation>
+        <relation type="one" fk-name="TKNG_CODODR_TKCD" rel-entity-name="TrackingCode">
+            <key-map field-name="trackingCodeId"/>
+        </relation>
+        <relation type="one" fk-name="TKNG_CODODR_TYP" rel-entity-name="TrackingCodeType">
+            <key-map field-name="trackingCodeTypeId"/>
+        </relation>
     </entity>
     <entity entity-name="TrackingCodeOrderReturn"
             package-name="org.apache.ofbiz.marketing.tracking"
             title="Tracking Code And Order Return">
-      <field name="returnId" type="id"/>
-      <field name="orderId" type="id"/>
-      <field name="orderItemSeqId" type="id"/>
-      <field name="trackingCodeTypeId" type="id"/>
-      <field name="trackingCodeId" type="id"/>
-      <field name="isBillable" type="indicator"/>
-      <field name="siteId" type="long-varchar"/>
-      <field name="hasExported" type="indicator"/>
-      <field name="affiliateReferredTimeStamp" type="date-time"/>
-      <prim-key field="returnId"/>
-      <prim-key field="orderId"/>
-      <prim-key field="trackingCodeTypeId"/>
-      <relation type="one" fk-name="TKNG_CODODR_RTN" rel-entity-name="ReturnHeader">
-        <key-map field-name="returnId"/>
-      </relation>
-      <relation type="one" fk-name="TKNG_CODODR_ODRTN" rel-entity-name="OrderHeader">
-        <key-map field-name="orderId"/>
-      </relation>
-      <relation type="one" fk-name="TKNG_CODODR_RTNTCD" rel-entity-name="TrackingCode">
-        <key-map field-name="trackingCodeId"/>
-      </relation>
-      <relation type="one" fk-name="TKNG_CODODR_RTNTYP" rel-entity-name="TrackingCodeType">
-        <key-map field-name="trackingCodeTypeId"/>
-      </relation>
+        <field name="returnId" type="id"/>
+        <field name="orderId" type="id"/>
+        <field name="orderItemSeqId" type="id"/>
+        <field name="trackingCodeTypeId" type="id"/>
+        <field name="trackingCodeId" type="id"/>
+        <field name="isBillable" type="indicator"/>
+        <field name="siteId" type="long-varchar"/>
+        <field name="hasExported" type="indicator"/>
+        <field name="affiliateReferredTimeStamp" type="date-time"/>
+        <prim-key field="returnId"/>
+        <prim-key field="orderId"/>
+        <prim-key field="trackingCodeTypeId"/>
+        <relation type="one" fk-name="TKNG_CODODR_RTN" rel-entity-name="ReturnHeader">
+            <key-map field-name="returnId"/>
+        </relation>
+        <relation type="one" fk-name="TKNG_CODODR_ODRTN" rel-entity-name="OrderHeader">
+            <key-map field-name="orderId"/>
+        </relation>
+        <relation type="one" fk-name="TKNG_CODODR_RTNTCD" rel-entity-name="TrackingCode">
+            <key-map field-name="trackingCodeId"/>
+        </relation>
+        <relation type="one" fk-name="TKNG_CODODR_RTNTYP" rel-entity-name="TrackingCodeType">
+            <key-map field-name="trackingCodeTypeId"/>
+        </relation>
     </entity>
     <entity entity-name="TrackingCodeType"
             package-name="org.apache.ofbiz.marketing.tracking"
             default-resource-name="MarketingEntityLabels"
             title="Tracking Code Type Entity">
-      <field name="trackingCodeTypeId" type="id"/>
-      <field name="description" type="description"/>
-      <prim-key field="trackingCodeTypeId"/>
+        <field name="trackingCodeTypeId" type="id"/>
+        <field name="description" type="description"/>
+        <prim-key field="trackingCodeTypeId"/>
     </entity>
     <entity entity-name="TrackingCodeVisit"
             package-name="org.apache.ofbiz.marketing.tracking"
             title="Tracking Code Visit Entity">
-      <field name="trackingCodeId" type="id"/>
-      <field name="visitId" type="id"/>
-      <field name="fromDate" type="date-time"/>
-      <field name="sourceEnumId" type="id"/>
-      <prim-key field="trackingCodeId"/>
-      <prim-key field="visitId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="TKNG_CODVST_TKCD" rel-entity-name="TrackingCode">
-        <key-map field-name="trackingCodeId"/>
-      </relation>
-      <relation type="one" fk-name="TKNG_CODVST_SRCEM" rel-entity-name="Enumeration">
-        <key-map field-name="sourceEnumId" rel-field-name="enumId"/>
-      </relation>
+        <field name="trackingCodeId" type="id"/>
+        <field name="visitId" type="id"/>
+        <field name="fromDate" type="date-time"/>
+        <field name="sourceEnumId" type="id"/>
+        <prim-key field="trackingCodeId"/>
+        <prim-key field="visitId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="TKNG_CODVST_TKCD" rel-entity-name="TrackingCode">
+            <key-map field-name="trackingCodeId"/>
+        </relation>
+        <relation type="one" fk-name="TKNG_CODVST_SRCEM" rel-entity-name="Enumeration">
+            <key-map field-name="sourceEnumId" rel-field-name="enumId"/>
+        </relation>
     </entity>
 
     <!-- ========================================================= -->
     <!-- org.apache.ofbiz.marketing.reports -->
     <!-- ========================================================= -->
 
-     <view-entity entity-name="TrackingCodeAndVisit"
-                  package-name="org.apache.ofbiz.marketing.reports"
-                  title="View entity for reporting number of visits for a tracking code">
+    <view-entity entity-name="TrackingCodeAndVisit"
+                 package-name="org.apache.ofbiz.marketing.reports"
+                 title="View entity for reporting number of visits for a tracking code">
         <member-entity entity-alias="TC" entity-name="TrackingCode"/>
         <member-entity entity-alias="TCV" entity-name="TrackingCodeVisit"/>
         <alias entity-alias="TC" name="trackingCodeId" group-by="true"/>
@@ -569,10 +568,10 @@ under the License.
         <view-link entity-alias="TC" rel-entity-alias="TCV" rel-optional="true">
             <key-map field-name="trackingCodeId"/>
         </view-link>
-      </view-entity>
-      <view-entity entity-name="TrackingCodeAndOrderHeader"
-                   package-name="org.apache.ofbiz.marketing.reports"
-                   title="View entity for reporting number of orders and total order amounts">
+    </view-entity>
+    <view-entity entity-name="TrackingCodeAndOrderHeader"
+                 package-name="org.apache.ofbiz.marketing.reports"
+                 title="View entity for reporting number of orders and total order amounts">
         <member-entity entity-alias="TCO" entity-name="TrackingCodeOrder"/>
         <member-entity entity-alias="OH" entity-name="OrderHeader"/>
         <alias entity-alias="OH" name="grandTotal" function="sum"/>
@@ -587,41 +586,41 @@ under the License.
                  package-name="org.apache.ofbiz.marketing.reports"
                  never-cache="true"
                  title="Order Header And Tracking Code Order View Entity">
-      <member-entity entity-alias="TCO" entity-name="TrackingCodeOrder"/>
-      <member-entity entity-alias="OH" entity-name="OrderHeader"/>
-      <alias entity-alias="TCO" name="orderId"/>
-      <alias entity-alias="TCO" name="trackingCodeId"/>
-      <alias entity-alias="TCO" name="siteId"/>
-      <alias entity-alias="TCO" name="hasExported"/>
-      <alias entity-alias="TCO" name="affiliateReferredTimeStamp"/>
-      <alias entity-alias="OH" name="statusId"/>
-      <view-link entity-alias="TCO" rel-entity-alias="OH">
-        <key-map field-name="orderId"/>
-      </view-link>
-      <relation type="one" rel-entity-name="OrderHeader">
+        <member-entity entity-alias="TCO" entity-name="TrackingCodeOrder"/>
+        <member-entity entity-alias="OH" entity-name="OrderHeader"/>
+        <alias entity-alias="TCO" name="orderId"/>
+        <alias entity-alias="TCO" name="trackingCodeId"/>
+        <alias entity-alias="TCO" name="siteId"/>
+        <alias entity-alias="TCO" name="hasExported"/>
+        <alias entity-alias="TCO" name="affiliateReferredTimeStamp"/>
+        <alias entity-alias="OH" name="statusId"/>
+        <view-link entity-alias="TCO" rel-entity-alias="OH">
+            <key-map field-name="orderId"/>
+        </view-link>
+        <relation type="one" rel-entity-name="OrderHeader">
             <key-map field-name="orderId"/>
-      </relation>
+        </relation>
     </view-entity>
     <view-entity entity-name="TrackingCodeOrderReturnAndReturnHeader"
                  package-name="org.apache.ofbiz.marketing.reports"
                  never-cache="true"
                  title="Return Header And Tracking Code Order Return View Entity">
-      <member-entity entity-alias="TCO" entity-name="TrackingCodeOrderReturn"/>
-      <member-entity entity-alias="RH" entity-name="ReturnHeader"/>
-      <alias entity-alias="TCO" name="returnId"/>
-      <alias entity-alias="TCO" name="orderId"/>
-      <alias entity-alias="TCO" name="orderItemSeqId"/>
-      <alias entity-alias="TCO" name="trackingCodeId"/>
-      <alias entity-alias="TCO" name="siteId"/>
-      <alias entity-alias="TCO" name="hasExported"/>
-      <alias entity-alias="TCO" name="affiliateReferredTimeStamp"/>
-      <alias entity-alias="RH" name="statusId"/>
-      <view-link entity-alias="TCO" rel-entity-alias="RH">
-        <key-map field-name="returnId"/>
-      </view-link>
-      <relation type="one" rel-entity-name="ReturnHeader">
+        <member-entity entity-alias="TCO" entity-name="TrackingCodeOrderReturn"/>
+        <member-entity entity-alias="RH" entity-name="ReturnHeader"/>
+        <alias entity-alias="TCO" name="returnId"/>
+        <alias entity-alias="TCO" name="orderId"/>
+        <alias entity-alias="TCO" name="orderItemSeqId"/>
+        <alias entity-alias="TCO" name="trackingCodeId"/>
+        <alias entity-alias="TCO" name="siteId"/>
+        <alias entity-alias="TCO" name="hasExported"/>
+        <alias entity-alias="TCO" name="affiliateReferredTimeStamp"/>
+        <alias entity-alias="RH" name="statusId"/>
+        <view-link entity-alias="TCO" rel-entity-alias="RH">
             <key-map field-name="returnId"/>
-      </relation>
+        </view-link>
+        <relation type="one" rel-entity-name="ReturnHeader">
+            <key-map field-name="returnId"/>
+        </relation>
     </view-entity>
     <view-entity entity-name="MarketingCampaignAndVisit"
                  package-name="org.apache.ofbiz.marketing.reports"
@@ -636,10 +635,10 @@ under the License.
         <view-link entity-alias="TC" rel-entity-alias="TCV" rel-optional="true">
             <key-map field-name="trackingCodeId"/>
         </view-link>
-      </view-entity>
-      <view-entity entity-name="MarketingCampaignAndOrderHeader"
-                   package-name="org.apache.ofbiz.marketing.reports"
-                   title="View entity for reporting number of orders and total order amounts">
+    </view-entity>
+    <view-entity entity-name="MarketingCampaignAndOrderHeader"
+                 package-name="org.apache.ofbiz.marketing.reports"
+                 title="View entity for reporting number of orders and total order amounts">
         <member-entity entity-alias="TC" entity-name="TrackingCode"/>
         <member-entity entity-alias="TCO" entity-name="TrackingCodeOrder"/>
         <member-entity entity-alias="OH" entity-name="OrderHeader"/>
@@ -655,9 +654,9 @@ under the License.
         </view-link>
     </view-entity>
 
-  <!-- ========================================================= -->
-  <!-- org.apache.ofbiz.marketing.opportunity -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.apache.ofbiz.marketing.opportunity -->
+    <!-- ========================================================= -->
 
     <entity entity-name="SalesOpportunity"
             package-name="org.apache.ofbiz.marketing.opportunity"
@@ -752,14 +751,14 @@ under the License.
     </entity>
 
     <view-entity entity-name="SalesOpportunityAndRole" package-name="org.apache.ofbiz.marketing.opportunity" title="SalesOpportunity And Role View Entity">
-      <member-entity entity-alias="SO" entity-name="SalesOpportunity"/>
-      <member-entity entity-alias="SR" entity-name="SalesOpportunityRole"/>
-      <alias-all entity-alias="SO"/>
-      <alias name="partyId" entity-alias="SR"/>
-      <alias name="roleTypeId" entity-alias="SR"/>
-      <view-link entity-alias="SO" rel-entity-alias="SR" rel-optional="true">
-        <key-map field-name="salesOpportunityId"/>
-      </view-link>
+        <member-entity entity-alias="SO" entity-name="SalesOpportunity"/>
+        <member-entity entity-alias="SR" entity-name="SalesOpportunityRole"/>
+        <alias-all entity-alias="SO"/>
+        <alias name="partyId" entity-alias="SR"/>
+        <alias name="roleTypeId" entity-alias="SR"/>
+        <view-link entity-alias="SO" rel-entity-alias="SR" rel-optional="true">
+            <key-map field-name="salesOpportunityId"/>
+        </view-link>
     </view-entity>
 
     <entity entity-name="SalesOpportunityStage"
@@ -938,17 +937,17 @@ under the License.
         </relation>
     </entity>
     <view-entity entity-name="SalesForecastAndCustomTimePeriod"
-            package-name="org.apache.ofbiz.marketing.opportunity"
-            title="View for selecting the forecast with its time period.">
-      <member-entity entity-alias="SF" entity-name="SalesForecast"/>
-      <member-entity entity-alias="CTP" entity-name="CustomTimePeriod"/>
-      <alias-all entity-alias="SF"/>
-      <alias-all entity-alias="CTP">
-          <exclude field="organizationPartyId"/>
-      </alias-all>
-      <view-link entity-alias="SF" rel-entity-alias="CTP">
-        <key-map field-name="customTimePeriodId"/>
-      </view-link>
+                 package-name="org.apache.ofbiz.marketing.opportunity"
+                 title="View for selecting the forecast with its time period.">
+        <member-entity entity-alias="SF" entity-name="SalesForecast"/>
+        <member-entity entity-alias="CTP" entity-name="CustomTimePeriod"/>
+        <alias-all entity-alias="SF"/>
+        <alias-all entity-alias="CTP">
+            <exclude field="organizationPartyId"/>
+        </alias-all>
+        <view-link entity-alias="SF" rel-entity-alias="CTP">
+            <key-map field-name="customTimePeriodId"/>
+        </view-link>
     </view-entity>
 
 </entitymodel>