svn commit: r1830545 [5/7] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/data/ applications/commonext/data/ applications/content/data/ applications/datamodel/data/demo/ applications/datamodel/data/seed/ applications/order/data/ application...

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

svn commit: r1830545 [5/7] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/data/ applications/commonext/data/ applications/content/data/ applications/datamodel/data/demo/ applications/datamodel/data/seed/ applications/order/data/ application...

rishi
Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/HumanResSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/HumanResSeedData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/HumanResSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/HumanResSeedData.xml Mon Apr 30 10:52:55 2018
@@ -19,25 +19,25 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <StatusType description="Employment Application" hasTable="N" parentTypeId="" statusTypeId="EMPLOYMENT_APP_STTS"/>
-    <StatusType description="Employee Position Status" hasTable="N" parentTypeId="" statusTypeId="EMPL_POSITION_STATUS"/>
+    <StatusType description="Employment Application" hasTable="N" statusTypeId="EMPLOYMENT_APP_STTS"/>
+    <StatusType description="Employee Position Status" hasTable="N" statusTypeId="EMPL_POSITION_STATUS"/>
     <StatusItem description="Planned For" sequenceId="01" statusCode="PLANNED_FOR" statusId="EMPL_POS_PLANNEDFOR" statusTypeId="EMPL_POSITION_STATUS"/>
     <StatusItem description="Active/Open" sequenceId="02" statusCode="ACTIVE" statusId="EMPL_POS_ACTIVE" statusTypeId="EMPL_POSITION_STATUS"/>
     <StatusItem description="Inactive/Closed" sequenceId="03" statusCode="INACTIVE" statusId="EMPL_POS_INACTIVE" statusTypeId="EMPL_POSITION_STATUS"/>
 
-    <StatusType description="Unemployment Claim" hasTable="N" parentTypeId="" statusTypeId="UNEMPL_CLAIM_STATUS"/>
+    <StatusType description="Unemployment Claim" hasTable="N" statusTypeId="UNEMPL_CLAIM_STATUS"/>
 
-    <StatusType description="Degree status" hasTable="N" parentTypeId="" statusTypeId="HR_DEGREE_STATUS"/>
+    <StatusType description="Degree status" hasTable="N" statusTypeId="HR_DEGREE_STATUS"/>
     <StatusItem description="Completed" sequenceId="01" statusCode="COMPLETE" statusId="HR_DS_COMPLETE" statusTypeId="HR_DEGREE_STATUS"/>
     <StatusItem description="Incomplete" sequenceId="02" statusCode="INCOMPLETE" statusId="HR_DS_INCOMPLETE" statusTypeId="HR_DEGREE_STATUS"/>
     <StatusItem description="Deferred" sequenceId="03" statusCode="DEFERRED" statusId="HR_DS_DEFERRED" statusTypeId="HR_DEGREE_STATUS"/>
 
-    <StatusType description="Job status" hasTable="N" parentTypeId="" statusTypeId="HR_JOB_STATUS"/>
+    <StatusType description="Job status" hasTable="N" statusTypeId="HR_JOB_STATUS"/>
     <StatusItem description="Full time" sequenceId="01" statusCode="FULLTIME" statusId="HR_JS_FULLTIME" statusTypeId="HR_JOB_STATUS"/>
     <StatusItem description="Part time" sequenceId="02" statusCode="PARTTIME" statusId="HR_JS_PARTTIME" statusTypeId="HR_JOB_STATUS"/>
     <StatusItem description="Contractor" sequenceId="03" statusCode="CONTRACTOR" statusId="HR_JS_CONTRACTOR" statusTypeId="HR_JOB_STATUS"/>
 
-    <StatusType description="PartyQual verification status" hasTable="N" parentTypeId="" statusTypeId="PARTYQUAL_VERIFY"/>
+    <StatusType description="PartyQual verification status" hasTable="N" statusTypeId="PARTYQUAL_VERIFY"/>
     <StatusItem description="Not verified" sequenceId="01" statusCode="NOT_VERIFIED" statusId="PQV_NOT_VERIFIED" statusTypeId="PARTYQUAL_VERIFY"/>
     <StatusItem description="Verified" sequenceId="02" statusCode="VERIFIED" statusId="PQV_VERIFIED" statusTypeId="PARTYQUAL_VERIFY"/>
 
@@ -61,71 +61,71 @@ under the License.
     <StatusItem statusId="LEAVE_CREATED" statusTypeId="LEAVE_STATUS"  description="Created"/>
     <StatusItem statusId="LEAVE_REJECTED" statusTypeId="LEAVE_STATUS"  description="Rejected"/>
 
-    <EmplPositionType description="Programmer" hasTable="N" parentTypeId="" emplPositionTypeId="PROGRAMMER"/>
-    <EmplPositionType description="System Administrator" hasTable="N" parentTypeId="" emplPositionTypeId="SYS_ADMIN"/>
-    <EmplPositionType description="Business Analyst" hasTable="N" parentTypeId="" emplPositionTypeId="BIZ_ANALYST"/>
-    <EmplPositionType description="Chief Executive Officer" hasTable="N" parentTypeId="" emplPositionTypeId="CEO"/>
-    <EmplPositionType description="Chief Financial Officer" hasTable="N" parentTypeId="" emplPositionTypeId="CFO"/>
-    <EmplPositionType description="Chief Information Officer" hasTable="N" parentTypeId="" emplPositionTypeId="CIO"/>
-    <EmplPositionType description="Chief Marketing Officer" hasTable="N" parentTypeId="" emplPositionTypeId="CMO"/>
-    <EmplPositionType description="Chief Compliance Officer" hasTable="N" parentTypeId="" emplPositionTypeId="CCO"/>
-    <EmplPositionType description="Chief Security Officer" hasTable="N" parentTypeId="" emplPositionTypeId="CSO"/>
-
-    <ResponsibilityType description="Finance Management" hasTable="N" parentTypeId="" responsibilityTypeId="FIN_MGMT"/>
-    <ResponsibilityType description="Inventory Management" hasTable="N" parentTypeId="" responsibilityTypeId="INV_MGMT"/>
-    <ResponsibilityType description="Purchase Management" hasTable="N" parentTypeId="" responsibilityTypeId="PUR_MGMT"/>
-    <ResponsibilityType description="Resource Management" hasTable="N" parentTypeId="" responsibilityTypeId="RES_MGMT"/>
-    <ResponsibilityType description="Production Management" hasTable="N" parentTypeId="" responsibilityTypeId="PROD_MGMT"/>
-    <ResponsibilityType description="Sales Management" hasTable="N" parentTypeId="" responsibilityTypeId="SALES_MGMT"/>
-    <ResponsibilityType description="General Management" hasTable="N" parentTypeId="" responsibilityTypeId="GENERAL_MGMT"/>
-    <ResponsibilityType description="Information Management" hasTable="N" parentTypeId="" responsibilityTypeId="INFO_MGMT"/>
-    <ResponsibilityType description="Marketing Management" hasTable="N" parentTypeId="" responsibilityTypeId="MKTG_MGMT"/>
-    <ResponsibilityType description="Compliance Management" hasTable="N" parentTypeId="" responsibilityTypeId="COMPLI_MGMT"/>
-    <ResponsibilityType description="Security Management" hasTable="N" parentTypeId="" responsibilityTypeId="SECUR_MGMT"/>
-
-    <BenefitType description="Health" hasTable="N" parentTypeId="" benefitTypeId="HEALTH"/>
-    <BenefitType description="Vacation" hasTable="N" parentTypeId="" benefitTypeId="VACATION"/>
-    <BenefitType description="Sick Leave" hasTable="N" parentTypeId="" benefitTypeId="SICK_LEAVE"/>
+    <EmplPositionType description="Programmer" hasTable="N" emplPositionTypeId="PROGRAMMER"/>
+    <EmplPositionType description="System Administrator" hasTable="N" emplPositionTypeId="SYS_ADMIN"/>
+    <EmplPositionType description="Business Analyst" hasTable="N" emplPositionTypeId="BIZ_ANALYST"/>
+    <EmplPositionType description="Chief Executive Officer" hasTable="N" emplPositionTypeId="CEO"/>
+    <EmplPositionType description="Chief Financial Officer" hasTable="N" emplPositionTypeId="CFO"/>
+    <EmplPositionType description="Chief Information Officer" hasTable="N" emplPositionTypeId="CIO"/>
+    <EmplPositionType description="Chief Marketing Officer" hasTable="N" emplPositionTypeId="CMO"/>
+    <EmplPositionType description="Chief Compliance Officer" hasTable="N" emplPositionTypeId="CCO"/>
+    <EmplPositionType description="Chief Security Officer" hasTable="N" emplPositionTypeId="CSO"/>
+
+    <ResponsibilityType description="Finance Management" hasTable="N" responsibilityTypeId="FIN_MGMT"/>
+    <ResponsibilityType description="Inventory Management" hasTable="N" responsibilityTypeId="INV_MGMT"/>
+    <ResponsibilityType description="Purchase Management" hasTable="N" responsibilityTypeId="PUR_MGMT"/>
+    <ResponsibilityType description="Resource Management" hasTable="N" responsibilityTypeId="RES_MGMT"/>
+    <ResponsibilityType description="Production Management" hasTable="N" responsibilityTypeId="PROD_MGMT"/>
+    <ResponsibilityType description="Sales Management" hasTable="N" responsibilityTypeId="SALES_MGMT"/>
+    <ResponsibilityType description="General Management" hasTable="N" responsibilityTypeId="GENERAL_MGMT"/>
+    <ResponsibilityType description="Information Management" hasTable="N" responsibilityTypeId="INFO_MGMT"/>
+    <ResponsibilityType description="Marketing Management" hasTable="N" responsibilityTypeId="MKTG_MGMT"/>
+    <ResponsibilityType description="Compliance Management" hasTable="N" responsibilityTypeId="COMPLI_MGMT"/>
+    <ResponsibilityType description="Security Management" hasTable="N" responsibilityTypeId="SECUR_MGMT"/>
+
+    <BenefitType description="Health" hasTable="N" benefitTypeId="HEALTH"/>
+    <BenefitType description="Vacation" hasTable="N" benefitTypeId="VACATION"/>
+    <BenefitType description="Sick Leave" hasTable="N" benefitTypeId="SICK_LEAVE"/>
 
     <TrainingClassType trainingClassTypeId="BASIC_TRAINING" description="Basic Training"/>
     <TrainingClassType trainingClassTypeId="ONJOB_TRAINING" description="On Job Training"/>
     <TrainingClassType trainingClassTypeId="ADVAN_TRAINING" description="Advance Training"/>
     <TrainingClassType trainingClassTypeId="IMPRO_TRAINING" description="Improvement Training"/>
 
-    <PartyQualType description="Degree" hasTable="N" parentTypeId="" partyQualTypeId="DEGREE"/>
-    <PartyQualType description="Certification" hasTable="N" parentTypeId="" partyQualTypeId="CERTIFICATION"/>
+    <PartyQualType description="Degree" hasTable="N" partyQualTypeId="DEGREE"/>
+    <PartyQualType description="Certification" hasTable="N" partyQualTypeId="CERTIFICATION"/>
 
     <PartyQualType partyQualTypeId="B.Tech" parentTypeId="DEGREE" description="Bachelor of Technology"/>
     <PartyQualType partyQualTypeId="MBA" parentTypeId="DEGREE" description="Masters of business administration"/>
     <PartyQualType partyQualTypeId="MSC" parentTypeId="DEGREE" description="Masters of Science"/>
     <PartyQualType partyQualTypeId="BSC" parentTypeId="DEGREE" description="Bachelor of Science"/>
         
-    <EnumerationType description="Interview Rating" enumTypeId="INTR_RATNG" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Interview Rating" enumTypeId="INTR_RATNG" hasTable="N"/>
     <Enumeration description="A (above 75%)" enumCode="RATING_A" enumId="INTR_RATNG_A" sequenceId="01" enumTypeId="INTR_RATNG"/>
     <Enumeration description="B (60-75%)" enumCode="RATING_B" enumId="INTR_RATNG_B" sequenceId="02" enumTypeId="INTR_RATNG"/>
     <Enumeration description="C (45-60%)" enumCode="RATING_C" enumId="INTR_RATNG_C" sequenceId="03" enumTypeId="INTR_RATNG"/>
     <Enumeration description="D (below 40%)" enumCode="RATING_D" enumId="INTR_RATNG_D" sequenceId="04" enumTypeId="INTR_RATNG"/>
 
-    <EmploymentAppSourceType description="NewsPaper" hasTable="N" parentTypeId="" employmentAppSourceTypeId="NEWS_PAPER"/>
-    <EmploymentAppSourceType description="PersonalReferal" hasTable="N" parentTypeId="" employmentAppSourceTypeId="PER_REF"/>
-    <EmploymentAppSourceType description="Internet" hasTable="N" parentTypeId="" employmentAppSourceTypeId="INTERNET"/>
-    <EmploymentAppSourceType description="Advertisement" hasTable="N" parentTypeId="" employmentAppSourceTypeId="ADV"/>
-
-    <DeductionType description="Federal Tax" parentTypeId="" deductionTypeId="FED_TAX"/>
-    <DeductionType description="State Tax" parentTypeId="" deductionTypeId="STATE_TAX"/>
-    <DeductionType description="Insurance" parentTypeId="" deductionTypeId="INSURANCE"/>
-    <DeductionType description="Cafeteria Plan" parentTypeId="" deductionTypeId="CAFE_PLAN"/>
-
-    <TerminationType description="Resignation" hasTable="N" parentTypeId="" terminationTypeId="RESIGN"/>
-    <TerminationType description="Fired" hasTable="N" parentTypeId="" terminationTypeId="FIRE"/>
-    <TerminationType description="Retirement" hasTable="N" parentTypeId="" terminationTypeId="RETIRE"/>
-
-    <EmplLeaveType description="Inland Earned Leave" hasTable="N" parentTypeId="" leaveTypeId="INLAND_EARNED"/>
-    <EmplLeaveType description="Inland Loss of Pay" hasTable="N" parentTypeId="" leaveTypeId="LOSS_OF_PAY"/>
-    <EmplLeaveType description="Inland Restricted Holiday" hasTable="N" parentTypeId="" leaveTypeId="RESTRICTED_HOLIDAY"/>
-    <EmplLeaveType description="Inland Special Day Off" hasTable="N" parentTypeId="" leaveTypeId="SPECIAL_DAY_OFF"/>
+    <EmploymentAppSourceType description="NewsPaper" hasTable="N" employmentAppSourceTypeId="NEWS_PAPER"/>
+    <EmploymentAppSourceType description="PersonalReferal" hasTable="N" employmentAppSourceTypeId="PER_REF"/>
+    <EmploymentAppSourceType description="Internet" hasTable="N" employmentAppSourceTypeId="INTERNET"/>
+    <EmploymentAppSourceType description="Advertisement" hasTable="N" employmentAppSourceTypeId="ADV"/>
+
+    <DeductionType description="Federal Tax" deductionTypeId="FED_TAX"/>
+    <DeductionType description="State Tax" deductionTypeId="STATE_TAX"/>
+    <DeductionType description="Insurance" deductionTypeId="INSURANCE"/>
+    <DeductionType description="Cafeteria Plan" deductionTypeId="CAFE_PLAN"/>
+
+    <TerminationType description="Resignation" hasTable="N" terminationTypeId="RESIGN"/>
+    <TerminationType description="Fired" hasTable="N" terminationTypeId="FIRE"/>
+    <TerminationType description="Retirement" hasTable="N" terminationTypeId="RETIRE"/>
+
+    <EmplLeaveType description="Inland Earned Leave" hasTable="N" leaveTypeId="INLAND_EARNED"/>
+    <EmplLeaveType description="Inland Loss of Pay" hasTable="N" leaveTypeId="LOSS_OF_PAY"/>
+    <EmplLeaveType description="Inland Restricted Holiday" hasTable="N" leaveTypeId="RESTRICTED_HOLIDAY"/>
+    <EmplLeaveType description="Inland Special Day Off" hasTable="N" leaveTypeId="SPECIAL_DAY_OFF"/>
 
-    <EnumerationType description="Job Posting Types" enumTypeId="JOB_POSTING" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Job Posting Types" enumTypeId="JOB_POSTING" hasTable="N"/>
     <Enumeration description="Internal Job Posting" enumCode="POSTING_INTR" enumId="JOB_POSTING_INTR" sequenceId="01" enumTypeId="JOB_POSTING"/>
     <Enumeration description="External Job Posting" enumCode="POSTING_INTR" enumId="JOB_POSTING_EXTR" sequenceId="02" enumTypeId="JOB_POSTING"/>
 
@@ -139,7 +139,7 @@ under the License.
     <JobInterviewType jobInterviewTypeId="INFORMAL_INTERVW" description="It is a meeting in which a job seeker asks for advice rather than employment"/>
     <JobInterviewType jobInterviewTypeId="CASE_INTERVW" description="It is an interview in which the applicant is given a question/situation and asked to resolve it"/>
     
-    <EnumerationType description="Exam Type" enumTypeId="EXAM_TYPE" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Exam Type" enumTypeId="EXAM_TYPE" hasTable="N"/>
     <Enumeration description="Written Aptitude Exam" enumCode="WRITTEN_APT" enumId="EXAM_WRITTEN_APT" sequenceId="01" enumTypeId="EXAM_TYPE"/>
     <Enumeration description="Technical Exam" enumCode="TECHNICAL" enumId="EXAM_TECHNICAL" sequenceId="02" enumTypeId="EXAM_TYPE"/>
     <Enumeration description="Group Discussion" enumCode="GROUP_DISCN" enumId="EXAM_GROUP_DISCN" sequenceId="03" enumTypeId="EXAM_TYPE"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ManufacturingSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ManufacturingSeedData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ManufacturingSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ManufacturingSeedData.xml Mon Apr 30 10:52:55 2018
@@ -40,7 +40,7 @@ under the License.
     <!-- Default routing -->
     <!-- used when no explicit routing is associated to a product -->
     <WorkEffort workEffortId="DEFAULT_ROUTING" workEffortTypeId="ROUTING" currentStatusId="ROU_ACTIVE" workEffortName="Default Routing" description="Default Routing" revisionNumber="1" quantityToProduce="0"/>
-    <WorkEffort workEffortId="DEFAULT_TASK" workEffortTypeId="ROU_TASK" workEffortPurposeTypeId="ROU_ASSEMBLING" currentStatusId="ROU_ACTIVE" workEffortName="Default Routing Task" description="Default Routing Task" revisionNumber="1" fixedAssetId="" estimatedMilliSeconds="0" estimatedSetupMillis="0"/>
+    <WorkEffort workEffortId="DEFAULT_TASK" workEffortTypeId="ROU_TASK" workEffortPurposeTypeId="ROU_ASSEMBLING" currentStatusId="ROU_ACTIVE" workEffortName="Default Routing Task" description="Default Routing Task" revisionNumber="1" estimatedMilliSeconds="0" estimatedSetupMillis="0"/>
     <WorkEffortAssoc workEffortIdFrom="DEFAULT_ROUTING" workEffortIdTo="DEFAULT_TASK" workEffortAssocTypeId="ROUTING_COMPONENT" sequenceNum="10" fromDate="2004-09-24 15:09:38.736"/>
 
     <!-- Formulae -->

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/MarketingSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/MarketingSeedData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/MarketingSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/MarketingSeedData.xml Mon Apr 30 10:52:55 2018
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <StatusType description="Marketing Campaign" statusTypeId="MKTG_CAMP_STATUS" hasTable="N" parentTypeId=""/>
+    <StatusType description="Marketing Campaign" statusTypeId="MKTG_CAMP_STATUS" hasTable="N"/>
     <StatusItem description="Planned" sequenceId="01" statusCode="PLANNED" statusId="MKTG_CAMP_PLANNED" statusTypeId="MKTG_CAMP_STATUS"/>
     <StatusItem description="Approved" sequenceId="02" statusCode="APPROVED" statusId="MKTG_CAMP_APPROVED" statusTypeId="MKTG_CAMP_STATUS"/>
     <StatusItem description="In Progress" sequenceId="03" statusCode="INPROGRESS" statusId="MKTG_CAMP_INPROGRESS" statusTypeId="MKTG_CAMP_STATUS"/>
@@ -36,7 +36,7 @@ under the License.
     <ContactListType contactListTypeId="NEWSLETTER" description="Newsletter"/>
     <ContactListType contactListTypeId="ANNOUNCEMENT" description="Announcement"/>
 
-    <StatusType description="Contact List Party" statusTypeId="CONTACTLST_PARTY" hasTable="N" parentTypeId=""/>
+    <StatusType description="Contact List Party" statusTypeId="CONTACTLST_PARTY" hasTable="N"/>
     <StatusItem description="Pending Acceptance" sequenceId="01" statusCode="PENDING" statusId="CLPT_PENDING" statusTypeId="CONTACTLST_PARTY"/>
     <StatusItem description="Accepted" sequenceId="02" statusCode="ACCEPTED" statusId="CLPT_ACCEPTED" statusTypeId="CONTACTLST_PARTY"/>
     <StatusItem description="Rejected" sequenceId="03" statusCode="REJECTED" statusId="CLPT_REJECTED" statusTypeId="CONTACTLST_PARTY"/>
@@ -68,7 +68,7 @@ under the License.
     <TrackingCodeType trackingCodeTypeId="EXTERNAL" description="External"/>
     <TrackingCodeType trackingCodeTypeId="PARTNER_MGD" description="Partner Managed"/>
 
-    <EnumerationType description="Tracking Code Source" enumTypeId="TRACKINGCODE_SRC" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Tracking Code Source" enumTypeId="TRACKINGCODE_SRC" hasTable="N"/>
     <Enumeration description="Cookie" enumCode="COOKIE" enumId="TKCDSRC_COOKIE" sequenceId="01" enumTypeId="TRACKINGCODE_SRC"/>
     <Enumeration description="URL Parameter" enumCode="URL_PARAM" enumId="TKCDSRC_URL_PARAM" sequenceId="01" enumTypeId="TRACKINGCODE_SRC"/>
 
@@ -88,7 +88,7 @@ under the License.
     <DataSource dataSourceId="EMAIL" dataSourceTypeId="LEAD_SOURCE" description="Email"/>
     <DataSource dataSourceId="CAMPAIGN" dataSourceTypeId="LEAD_SOURCE" description="Campaign"/>
 
-    <StatusType parentTypeId="PARTY_STATUS" hasTable="" statusTypeId="LEAD_STATUS" description="Lead Status"/>
+    <StatusType parentTypeId="PARTY_STATUS" statusTypeId="LEAD_STATUS" description="Lead Status"/>
     <StatusItem description="Assigned" sequenceId="01" statusCode="ASSIGNED" statusId="LEAD_ASSIGNED" statusTypeId="LEAD_STATUS"/>
     <StatusItem description="Converted" sequenceId="02" statusCode="CONVERTED" statusId="LEAD_CONVERTED" statusTypeId="LEAD_STATUS"/>
     <StatusItem description="Qualified" sequenceId="03" statusCode="QUALIFIED" statusId="LEAD_QUALIFIED" statusTypeId="LEAD_STATUS"/>
@@ -100,5 +100,5 @@ under the License.
 
     <EnumerationType enumTypeId="SLSOPP_TYP_ENUM" description="Sales Opportunity Type"/>
 
-    <PartyIdentificationType description="VCard reference origin" partyIdentificationTypeId="VCARD_FN_ORIGIN" parentTypeId=""/>
+    <PartyIdentificationType description="VCard reference origin" partyIdentificationTypeId="VCARD_FN_ORIGIN"/>
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml Mon Apr 30 10:52:55 2018
@@ -19,14 +19,14 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <CustRequestType custRequestTypeId="RF_BUGFIX" description="Request For Bug Fix" hasTable="N" parentTypeId=""/>
-    <CustRequestType custRequestTypeId="RF_CATALOG" description="Request For Catalog" hasTable="N" parentTypeId=""/>
-    <CustRequestType custRequestTypeId="RF_FEATURE" description="Request For Feature" hasTable="N" parentTypeId=""/>
-    <CustRequestType custRequestTypeId="RF_INFO" description="Request For Information" hasTable="N" parentTypeId=""/>
-    <CustRequestType custRequestTypeId="RF_PROPOSAL" description="Request For Proposal" hasTable="N" parentTypeId=""/>
-    <CustRequestType custRequestTypeId="RF_QUOTE" description="Request For Quote" hasTable="N" parentTypeId=""/>
-    <CustRequestType custRequestTypeId="RF_SUPPORT" description="Request For Support" hasTable="N" parentTypeId=""/>
-    <CustRequestType custRequestTypeId="RF_PUR_QUOTE" description="Request For Purchase Quote" hasTable="N" parentTypeId=""/>
+    <CustRequestType custRequestTypeId="RF_BUGFIX" description="Request For Bug Fix" hasTable="N"/>
+    <CustRequestType custRequestTypeId="RF_CATALOG" description="Request For Catalog" hasTable="N"/>
+    <CustRequestType custRequestTypeId="RF_FEATURE" description="Request For Feature" hasTable="N"/>
+    <CustRequestType custRequestTypeId="RF_INFO" description="Request For Information" hasTable="N"/>
+    <CustRequestType custRequestTypeId="RF_PROPOSAL" description="Request For Proposal" hasTable="N"/>
+    <CustRequestType custRequestTypeId="RF_QUOTE" description="Request For Quote" hasTable="N"/>
+    <CustRequestType custRequestTypeId="RF_SUPPORT" description="Request For Support" hasTable="N"/>
+    <CustRequestType custRequestTypeId="RF_PUR_QUOTE" description="Request For Purchase Quote" hasTable="N"/>
 
     <CustRequestResolution custRequestResolutionId="FIXED" custRequestTypeId="RF_BUGFIX" description="Fixed"/>
     <CustRequestResolution custRequestResolutionId="WORKS" custRequestTypeId="RF_BUGFIX" description="Works For Me"/>
@@ -35,45 +35,45 @@ under the License.
     <CustRequestResolution custRequestResolutionId="REJECTED" custRequestTypeId="RF_FEATURE" description="Rejected"/>
     <CustRequestResolution custRequestResolutionId="IMPLEMENTED" custRequestTypeId="RF_FEATURE" description="Implemented"/>
 
-    <OrderAdjustmentType description="Promotion" hasTable="N" orderAdjustmentTypeId="PROMOTION_ADJUSTMENT" parentTypeId=""/>
-    <OrderAdjustmentType description="Replacement" hasTable="N" orderAdjustmentTypeId="REPLACE_ADJUSTMENT" parentTypeId=""/>
-    <OrderAdjustmentType description="Discount" hasTable="N" orderAdjustmentTypeId="DISCOUNT_ADJUSTMENT" parentTypeId=""/>
-    <OrderAdjustmentType description="Donation" hasTable="N" orderAdjustmentTypeId="DONATION_ADJUSTMENT" parentTypeId=""/>
-    <OrderAdjustmentType description="Fee" hasTable="N" orderAdjustmentTypeId="FEE" parentTypeId=""/>
-    <OrderAdjustmentType description="Miscellaneous Charges" hasTable="N" orderAdjustmentTypeId="MISCELLANEOUS_CHARGE" parentTypeId=""/>
-    <OrderAdjustmentType description="Sales Tax" hasTable="N" orderAdjustmentTypeId="SALES_TAX" parentTypeId=""/>
-    <OrderAdjustmentType description="VAT Tax (not added to totals)" hasTable="N" orderAdjustmentTypeId="VAT_TAX" parentTypeId=""/>
-    <OrderAdjustmentType description="VAT Price Correction" hasTable="N" orderAdjustmentTypeId="VAT_PRICE_CORRECT" parentTypeId=""/>
-    <OrderAdjustmentType description="Shipping and Handling" hasTable="N" orderAdjustmentTypeId="SHIPPING_CHARGES" parentTypeId=""/>
-    <OrderAdjustmentType description="Surcharge" hasTable="N" orderAdjustmentTypeId="SURCHARGE_ADJUSTMENT" parentTypeId=""/>
-    <OrderAdjustmentType description="Additional Feature" hasTable="N" orderAdjustmentTypeId="ADDITIONAL_FEATURE" parentTypeId=""/>
-    <OrderAdjustmentType description="Warranty" hasTable="N" orderAdjustmentTypeId="WARRANTY_ADJUSTMENT" parentTypeId=""/>
-    <OrderAdjustmentType description="Marketing Package Adjustment" hasTable="N" orderAdjustmentTypeId="MKTG_PKG_AUTO_ADJUST" parentTypeId=""/>
+    <OrderAdjustmentType description="Promotion" hasTable="N" orderAdjustmentTypeId="PROMOTION_ADJUSTMENT"/>
+    <OrderAdjustmentType description="Replacement" hasTable="N" orderAdjustmentTypeId="REPLACE_ADJUSTMENT"/>
+    <OrderAdjustmentType description="Discount" hasTable="N" orderAdjustmentTypeId="DISCOUNT_ADJUSTMENT"/>
+    <OrderAdjustmentType description="Donation" hasTable="N" orderAdjustmentTypeId="DONATION_ADJUSTMENT"/>
+    <OrderAdjustmentType description="Fee" hasTable="N" orderAdjustmentTypeId="FEE"/>
+    <OrderAdjustmentType description="Miscellaneous Charges" hasTable="N" orderAdjustmentTypeId="MISCELLANEOUS_CHARGE"/>
+    <OrderAdjustmentType description="Sales Tax" hasTable="N" orderAdjustmentTypeId="SALES_TAX"/>
+    <OrderAdjustmentType description="VAT Tax (not added to totals)" hasTable="N" orderAdjustmentTypeId="VAT_TAX"/>
+    <OrderAdjustmentType description="VAT Price Correction" hasTable="N" orderAdjustmentTypeId="VAT_PRICE_CORRECT"/>
+    <OrderAdjustmentType description="Shipping and Handling" hasTable="N" orderAdjustmentTypeId="SHIPPING_CHARGES"/>
+    <OrderAdjustmentType description="Surcharge" hasTable="N" orderAdjustmentTypeId="SURCHARGE_ADJUSTMENT"/>
+    <OrderAdjustmentType description="Additional Feature" hasTable="N" orderAdjustmentTypeId="ADDITIONAL_FEATURE"/>
+    <OrderAdjustmentType description="Warranty" hasTable="N" orderAdjustmentTypeId="WARRANTY_ADJUSTMENT"/>
+    <OrderAdjustmentType description="Marketing Package Adjustment" hasTable="N" orderAdjustmentTypeId="MKTG_PKG_AUTO_ADJUST"/>
 
     <OrderBlacklistType orderBlacklistTypeId="BLACKLIST_ADDRESS" description="Addresss"/>
     <OrderBlacklistType orderBlacklistTypeId="BLACKLIST_CREDITCARD" description="Credit Card"/>
     <OrderBlacklistType orderBlacklistTypeId="BLACKLIST_EMAIL" description="E-Mail"/>
     <OrderBlacklistType orderBlacklistTypeId="BLACKLIST_PHONE" description="Phone Number"/>
 
-    <OrderItemType description="Purchase Order Specific" hasTable="N" orderItemTypeId="PURCHASE_SPECIFIC" parentTypeId=""/>
+    <OrderItemType description="Purchase Order Specific" hasTable="N" orderItemTypeId="PURCHASE_SPECIFIC"/>
     <OrderItemType description="PO: Inventory" hasTable="N" orderItemTypeId="INVENTORY_ORDER_ITEM" parentTypeId="PURCHASE_SPECIFIC"/>
     <OrderItemType description="PO: Supplies (to Expense)" hasTable="N" orderItemTypeId="SUPPLIES_ORDER_ITEM" parentTypeId="PURCHASE_SPECIFIC"/>
     <OrderItemType description="PO: Fixed Asset" hasTable="N" orderItemTypeId="ASSET_ORDER_ITEM" parentTypeId="PURCHASE_SPECIFIC"/>
-    <OrderItemType description="Product Item" hasTable="N" orderItemTypeId="PRODUCT_ORDER_ITEM" parentTypeId=""/>
-    <OrderItemType description="Work Item" hasTable="N" orderItemTypeId="WORK_ORDER_ITEM" parentTypeId=""/>
-    <OrderItemType description="Rental Item" hasTable="N" orderItemTypeId="RENTAL_ORDER_ITEM" parentTypeId=""/>
-    <OrderItemType description="Bulk Item" hasTable="N" orderItemTypeId="BULK_ORDER_ITEM" parentTypeId=""/>
-
-    <OrderType description="Purchase" hasTable="N" orderTypeId="PURCHASE_ORDER" parentTypeId=""/>
-    <OrderType description="Sales" hasTable="N" orderTypeId="SALES_ORDER" parentTypeId=""/>
-
-    <OrderItemAssocType description="Purchase Order" hasTable="N" orderItemAssocTypeId="PURCHASE_ORDER" parentTypeId=""/>
-    <OrderItemAssocType description="Drop Shipment" hasTable="N" orderItemAssocTypeId="DROP_SHIPMENT" parentTypeId=""/>
-    <OrderItemAssocType description="Return Replacement" hasTable="N" orderItemAssocTypeId="REPLACEMENT" parentTypeId=""/>
-    <OrderItemAssocType description="New Version" hasTable="N" orderItemAssocTypeId="NEW_VERSION" parentTypeId=""/>
-    <OrderItemAssocType description="Exchange Order" hasTable="N" orderItemAssocTypeId="EXCHANGE" parentTypeId=""/>
+    <OrderItemType description="Product Item" hasTable="N" orderItemTypeId="PRODUCT_ORDER_ITEM"/>
+    <OrderItemType description="Work Item" hasTable="N" orderItemTypeId="WORK_ORDER_ITEM"/>
+    <OrderItemType description="Rental Item" hasTable="N" orderItemTypeId="RENTAL_ORDER_ITEM"/>
+    <OrderItemType description="Bulk Item" hasTable="N" orderItemTypeId="BULK_ORDER_ITEM"/>
+
+    <OrderType description="Purchase" hasTable="N" orderTypeId="PURCHASE_ORDER"/>
+    <OrderType description="Sales" hasTable="N" orderTypeId="SALES_ORDER"/>
+
+    <OrderItemAssocType description="Purchase Order" hasTable="N" orderItemAssocTypeId="PURCHASE_ORDER"/>
+    <OrderItemAssocType description="Drop Shipment" hasTable="N" orderItemAssocTypeId="DROP_SHIPMENT"/>
+    <OrderItemAssocType description="Return Replacement" hasTable="N" orderItemAssocTypeId="REPLACEMENT"/>
+    <OrderItemAssocType description="New Version" hasTable="N" orderItemAssocTypeId="NEW_VERSION"/>
+    <OrderItemAssocType description="Exchange Order" hasTable="N" orderItemAssocTypeId="EXCHANGE"/>
 
-    <EnumerationType description="Order Sales Channel" enumTypeId="ORDER_SALES_CHANNEL" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Order Sales Channel" enumTypeId="ORDER_SALES_CHANNEL" hasTable="N"/>
     <Enumeration description="Web Channel" enumCode="WEB_CHANNEL" enumId="WEB_SALES_CHANNEL" sequenceId="01" enumTypeId="ORDER_SALES_CHANNEL"/>
     <Enumeration description="Fax Channel" enumCode="FAX_CHANNEL" enumId="FAX_SALES_CHANNEL" sequenceId="03" enumTypeId="ORDER_SALES_CHANNEL"/>
     <Enumeration description="Phone Channel" enumCode="PHONE_CHANNEL" enumId="PHONE_SALES_CHANNEL" sequenceId="04" enumTypeId="ORDER_SALES_CHANNEL"/>
@@ -82,23 +82,23 @@ under the License.
     <Enumeration description="Affiliate Channel" enumCode="AFFIL_CHANNEL" enumId="AFFIL_SALES_CHANNEL" sequenceId="07" enumTypeId="ORDER_SALES_CHANNEL"/>
     <Enumeration description="eBay Channel" enumCode="EBAY_CHANNEL" enumId="EBAY_SALES_CHANNEL" sequenceId="08" enumTypeId="ORDER_SALES_CHANNEL"/>
     <Enumeration description="Unknown Channel" enumCode="UNKOWN_CHANNEL" enumId="UNKNWN_SALES_CHANNEL" sequenceId="99" enumTypeId="ORDER_SALES_CHANNEL"/>
-    <EnumerationType description="Order Item Change Type" enumTypeId="ODR_ITM_CHANGE_TYPE" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Order Item Change Type" enumTypeId="ODR_ITM_CHANGE_TYPE" hasTable="N"/>
     <Enumeration description="Order Item Update" enumCode="ITM_UPDATE" enumId="ODR_ITM_UPDATE" sequenceId="01" enumTypeId="ODR_ITM_CHANGE_TYPE"/>
     <Enumeration description="Order Item Cancel" enumCode="ITM_CANCEL" enumId="ODR_ITM_CANCEL" sequenceId="02" enumTypeId="ODR_ITM_CHANGE_TYPE"/>
     <Enumeration description="Order Item Append" enumCode="ITM_APPEND" enumId="ODR_ITM_APPEND" sequenceId="03" enumTypeId="ODR_ITM_CHANGE_TYPE"/>
-    <EnumerationType description="Order Item Change Reason" enumTypeId="ODR_ITM_CH_REASON" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Order Item Change Reason" enumTypeId="ODR_ITM_CH_REASON" hasTable="N"/>
     <Enumeration description="Mis-Ordered Item" enumCode="MISORDER" enumId="OICR_MISORDER_ITEM" sequenceId="01" enumTypeId="ODR_ITM_CH_REASON"/>
     <Enumeration description="Changed Mind" enumCode="CHANGE_MIND" enumId="OICR_CHANGE_MIND" sequenceId="02" enumTypeId="ODR_ITM_CH_REASON"/>
 
-    <QuoteType description="Other" hasTable="N" parentTypeId="" quoteTypeId="OTHER_QUOTE"/>
-    <QuoteType description="Product" hasTable="N" parentTypeId="" quoteTypeId="PRODUCT_QUOTE"/>
-    <QuoteType description="Proposal" hasTable="N" parentTypeId="" quoteTypeId="PROPOSAL"/>
-    <QuoteType description="Product Purchase" hasTable="N" parentTypeId="" quoteTypeId="PURCHASE_QUOTE"/>
-
-    <RequirementType description="Customer Requirement" hasTable="N" parentTypeId="" requirementTypeId="CUSTOMER_REQUIREMENT"/>
-    <RequirementType description="Internal Requirement" hasTable="N" parentTypeId="" requirementTypeId="INTERNAL_REQUIREMENT"/>
-    <RequirementType description="Product Requirement" hasTable="N" parentTypeId="" requirementTypeId="PRODUCT_REQUIREMENT"/>
-    <RequirementType description="Work Requirement" hasTable="N" parentTypeId="" requirementTypeId="WORK_REQUIREMENT"/>
+    <QuoteType description="Other" hasTable="N" quoteTypeId="OTHER_QUOTE"/>
+    <QuoteType description="Product" hasTable="N" quoteTypeId="PRODUCT_QUOTE"/>
+    <QuoteType description="Proposal" hasTable="N" quoteTypeId="PROPOSAL"/>
+    <QuoteType description="Product Purchase" hasTable="N" quoteTypeId="PURCHASE_QUOTE"/>
+
+    <RequirementType description="Customer Requirement" hasTable="N" requirementTypeId="CUSTOMER_REQUIREMENT"/>
+    <RequirementType description="Internal Requirement" hasTable="N" requirementTypeId="INTERNAL_REQUIREMENT"/>
+    <RequirementType description="Product Requirement" hasTable="N" requirementTypeId="PRODUCT_REQUIREMENT"/>
+    <RequirementType description="Work Requirement" hasTable="N" requirementTypeId="WORK_REQUIREMENT"/>
 
     <ShoppingListType description="Wish List" shoppingListTypeId="SLT_WISH_LIST"/>
     <ShoppingListType description="Gift Registry" shoppingListTypeId="SLT_GIFT_REG"/>
@@ -107,7 +107,7 @@ under the License.
     <ShoppingListType description="Special Purpose" shoppingListTypeId="SLT_SPEC_PURP"/>
 
     <!-- order and order item status -->
-    <StatusType description="Order" hasTable="N" parentTypeId="" statusTypeId="ORDER_STATUS"/>
+    <StatusType description="Order" hasTable="N" statusTypeId="ORDER_STATUS"/>
     <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="ORDER_CREATED" statusTypeId="ORDER_STATUS"/>
     <StatusItem description="Processing" sequenceId="04" statusCode="PROCESSING" statusId="ORDER_PROCESSING" statusTypeId="ORDER_STATUS"/>
     <StatusItem description="Approved" sequenceId="05" statusCode="APPROVED" statusId="ORDER_APPROVED" statusTypeId="ORDER_STATUS"/>
@@ -152,7 +152,7 @@ under the License.
     <StatusValidChange statusId="ITEM_COMPLETED" statusIdTo="ITEM_APPROVED" transitionName="Approve Item"/>
 
     <!-- order payment pref status -->
-    <StatusType description="Payment Preference" hasTable="N" parentTypeId="" statusTypeId="PAYMENT_PREF_STATUS"/>
+    <StatusType description="Payment Preference" hasTable="N" statusTypeId="PAYMENT_PREF_STATUS"/>
     <StatusItem description="Not-Received" sequenceId="01" statusCode="NOT_RECEIVED" statusId="PAYMENT_NOT_RECEIVED" statusTypeId="PAYMENT_PREF_STATUS"/>
     <StatusItem description="Received" sequenceId="02" statusCode="RECEIVED" statusId="PAYMENT_RECEIVED" statusTypeId="PAYMENT_PREF_STATUS"/>
     <StatusItem description="Not-Authorized" sequenceId="01" statusCode="NOT_AUTHORIZED" statusId="PAYMENT_NOT_AUTH" statusTypeId="PAYMENT_PREF_STATUS"/>
@@ -170,7 +170,7 @@ under the License.
     <StatusValidChange statusId="PAYMENT_SETTLED" statusIdTo="PAYMENT_REFUNDED" transitionName="Payment Refunded"/>
 
     <!-- order delivery schedule status -->
-    <StatusType description="Order Delivery Schedule" hasTable="N" parentTypeId="" statusTypeId="ORDER_DEL_SCH"/>
+    <StatusType description="Order Delivery Schedule" hasTable="N" statusTypeId="ORDER_DEL_SCH"/>
     <StatusItem description="Supplier Submitted" sequenceId="01" statusCode="SUBMITTED" statusId="ODS_SUBMITTED" statusTypeId="ORDER_DEL_SCH"/>
     <StatusItem description="Accepted" sequenceId="02" statusCode="ACCEPTED" statusId="ODS_ACCEPTED" statusTypeId="ORDER_DEL_SCH"/>
     <StatusItem description="Schedule Approved" sequenceId="03" statusCode="APPROVED" statusId="ODS_APPROVED" statusTypeId="ORDER_DEL_SCH"/>
@@ -185,7 +185,7 @@ under the License.
     <StatusValidChange statusId="ODS_ARRANGED" statusIdTo="ODS_CANCELLED" transitionName="Cancel Delivery"/>
 
     <!-- order return status for returns to customers -->
-    <StatusType description="Order Return Status For Customer Returns" hasTable="N" parentTypeId="" statusTypeId="ORDER_RETURN_STTS"/>
+    <StatusType description="Order Return Status For Customer Returns" hasTable="N" statusTypeId="ORDER_RETURN_STTS"/>
     <StatusItem description="Requested" sequenceId="01" statusCode="REQUESTED" statusId="RETURN_REQUESTED" statusTypeId="ORDER_RETURN_STTS"/>
     <StatusItem description="Accepted" sequenceId="02" statusCode="ACCEPTED" statusId="RETURN_ACCEPTED" statusTypeId="ORDER_RETURN_STTS"/>
     <StatusItem description="Received" sequenceId="03" statusCode="RECEIVED" statusId="RETURN_RECEIVED" statusTypeId="ORDER_RETURN_STTS"/>
@@ -200,7 +200,7 @@ under the License.
     <StatusValidChange statusId="RETURN_RECEIVED" statusIdTo="RETURN_CANCELLED" transitionName="Received Return Cancelled"/>
     <StatusValidChange statusId="RETURN_RECEIVED" statusIdTo="RETURN_MAN_REFUND" transitionName="Received Return Requires Manual Refund"/>
     <!-- order return status for returns to suppliers -->
-    <StatusType description="Order Return Status For Supplier Returns" hasTable="N" parentTypeId="" statusTypeId="PORDER_RETURN_STTS"/>
+    <StatusType description="Order Return Status For Supplier Returns" hasTable="N" statusTypeId="PORDER_RETURN_STTS"/>
     <StatusItem description="Requested" sequenceId="01" statusCode="REQUESTED" statusId="SUP_RETURN_REQUESTED" statusTypeId="PORDER_RETURN_STTS"/>
     <StatusItem description="Accepted" sequenceId="02" statusCode="ACCEPTED" statusId="SUP_RETURN_ACCEPTED" statusTypeId="PORDER_RETURN_STTS"/>
     <StatusItem description="Shipped" sequenceId="03" statusCode="SHIPPED" statusId="SUP_RETURN_SHIPPED" statusTypeId="PORDER_RETURN_STTS"/>
@@ -214,7 +214,7 @@ under the License.
     <StatusValidChange statusId="SUP_RETURN_SHIPPED" statusIdTo="SUP_RETURN_CANCELLED" transitionName="Shipped Return Cancelled"/>
 
     <!-- CustRequest statuses -->
-    <StatusType description="Custom Request Status" hasTable="N" parentTypeId="" statusTypeId="CUSTREQ_STTS"/>
+    <StatusType description="Custom Request Status" hasTable="N" statusTypeId="CUSTREQ_STTS"/>
     <StatusItem description="Draft" sequenceId="00" statusCode="DRAFT" statusId="CRQ_DRAFT" statusTypeId="CUSTREQ_STTS"/>
     <StatusItem description="Submitted" sequenceId="01" statusCode="SUBMITTED" statusId="CRQ_SUBMITTED" statusTypeId="CUSTREQ_STTS"/>
     <StatusItem description="Accepted" sequenceId="02" statusCode="ACCEPTED" statusId="CRQ_ACCEPTED" statusTypeId="CUSTREQ_STTS"/>
@@ -245,7 +245,7 @@ under the License.
     <StatusValidChange statusId="CRQ_COMPLETED" statusIdTo="CRQ_REVIEWED" transitionName="Re-open Request"/>
 
     <!-- Requirement statuses -->
-    <StatusType description="Requirement Status" hasTable="N" parentTypeId="" statusTypeId="REQUIREMENT_STATUS"/>
+    <StatusType description="Requirement Status" hasTable="N" statusTypeId="REQUIREMENT_STATUS"/>
     <StatusItem description="Proposed" sequenceId="01" statusCode="PROPOSED" statusId="REQ_PROPOSED" statusTypeId="REQUIREMENT_STATUS"/>
     <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="REQ_CREATED" statusTypeId="REQUIREMENT_STATUS"/>
     <StatusItem description="Approved" sequenceId="02" statusCode="APPROVED" statusId="REQ_APPROVED" statusTypeId="REQUIREMENT_STATUS"/>
@@ -259,7 +259,7 @@ under the License.
     <StatusValidChange statusId="REQ_APPROVED" statusIdTo="REQ_REJECTED" transitionName="Reject Requirement"/>
 
     <!-- Quote statuses -->
-    <StatusType description="Quote Status" hasTable="N" parentTypeId="" statusTypeId="QUOTE_STATUS"/>
+    <StatusType description="Quote Status" hasTable="N" statusTypeId="QUOTE_STATUS"/>
     <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="QUO_CREATED" statusTypeId="QUOTE_STATUS"/>
     <StatusItem description="Approved" sequenceId="02" statusCode="APPROVED" statusId="QUO_APPROVED" statusTypeId="QUOTE_STATUS"/>
     <StatusItem description="Ordered" sequenceId="03" statusCode="ORDERED" statusId="QUO_ORDERED" statusTypeId="QUOTE_STATUS"/>
@@ -270,28 +270,28 @@ under the License.
     <StatusValidChange statusId="QUO_APPROVED" statusIdTo="QUO_REJECTED" transitionName="Reject Quote"/>
 
     <!-- Return Adjustment Types-->
-    <ReturnAdjustmentType description="Return Promotion" hasTable="N" returnAdjustmentTypeId="RET_PROMOTION_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Replacement" hasTable="N" returnAdjustmentTypeId="RET_REPLACE_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Discount" hasTable="N" returnAdjustmentTypeId="RET_DISCOUNT_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Fee" hasTable="N" returnAdjustmentTypeId="RET_FEE_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Miscellaneous Charges" hasTable="N" returnAdjustmentTypeId="RET_MISC_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Sales Tax" hasTable="N" returnAdjustmentTypeId="RET_SALES_TAX_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return VAT Tax" hasTable="N" returnAdjustmentTypeId="RET_VAT_TAX_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return VAT Price Correction" hasTable="N" returnAdjustmentTypeId="RET_VAT_PC_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Shipping and Handling" hasTable="N" returnAdjustmentTypeId="RET_SHIPPING_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Surcharge" hasTable="N" returnAdjustmentTypeId="RET_SURCHARGE_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Additional Feature" hasTable="N" returnAdjustmentTypeId="RET_ADD_FEATURE_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Warranty" hasTable="N" returnAdjustmentTypeId="RET_WARRANTY_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Marketing Package Adjustment" hasTable="N" returnAdjustmentTypeId="RET_MKTG_PKG_ADJ" parentTypeId=""/>
-    <ReturnAdjustmentType description="Return Manual Adjustment" hasTable="N" returnAdjustmentTypeId="RET_MAN_ADJ" parentTypeId=""/>
+    <ReturnAdjustmentType description="Return Promotion" hasTable="N" returnAdjustmentTypeId="RET_PROMOTION_ADJ"/>
+    <ReturnAdjustmentType description="Return Replacement" hasTable="N" returnAdjustmentTypeId="RET_REPLACE_ADJ"/>
+    <ReturnAdjustmentType description="Return Discount" hasTable="N" returnAdjustmentTypeId="RET_DISCOUNT_ADJ"/>
+    <ReturnAdjustmentType description="Return Fee" hasTable="N" returnAdjustmentTypeId="RET_FEE_ADJ"/>
+    <ReturnAdjustmentType description="Return Miscellaneous Charges" hasTable="N" returnAdjustmentTypeId="RET_MISC_ADJ"/>
+    <ReturnAdjustmentType description="Return Sales Tax" hasTable="N" returnAdjustmentTypeId="RET_SALES_TAX_ADJ"/>
+    <ReturnAdjustmentType description="Return VAT Tax" hasTable="N" returnAdjustmentTypeId="RET_VAT_TAX_ADJ"/>
+    <ReturnAdjustmentType description="Return VAT Price Correction" hasTable="N" returnAdjustmentTypeId="RET_VAT_PC_ADJ"/>
+    <ReturnAdjustmentType description="Return Shipping and Handling" hasTable="N" returnAdjustmentTypeId="RET_SHIPPING_ADJ"/>
+    <ReturnAdjustmentType description="Return Surcharge" hasTable="N" returnAdjustmentTypeId="RET_SURCHARGE_ADJ"/>
+    <ReturnAdjustmentType description="Return Additional Feature" hasTable="N" returnAdjustmentTypeId="RET_ADD_FEATURE_ADJ"/>
+    <ReturnAdjustmentType description="Return Warranty" hasTable="N" returnAdjustmentTypeId="RET_WARRANTY_ADJ"/>
+    <ReturnAdjustmentType description="Return Marketing Package Adjustment" hasTable="N" returnAdjustmentTypeId="RET_MKTG_PKG_ADJ"/>
+    <ReturnAdjustmentType description="Return Manual Adjustment" hasTable="N" returnAdjustmentTypeId="RET_MAN_ADJ"/>
 
     <!-- Return Header Types -->
     <ReturnHeaderType description="Return from Customer" returnHeaderTypeId="CUSTOMER_RETURN"/>
     <ReturnHeaderType description="Return to Vendor" returnHeaderTypeId="VENDOR_RETURN"/>
 
     <!-- return item types for returns -->
-    <ReturnItemType description="Return Non-Product Item" returnItemTypeId="RET_NPROD_ITEM" parentTypeId=""/>
-    <ReturnItemType description="Return Product Item" returnItemTypeId="RET_PROD_ITEM" parentTypeId=""/>
+    <ReturnItemType description="Return Non-Product Item" returnItemTypeId="RET_NPROD_ITEM"/>
+    <ReturnItemType description="Return Product Item" returnItemTypeId="RET_PROD_ITEM"/>
     <ReturnItemType description="Return Finished Good Item" returnItemTypeId="RET_FPROD_ITEM" parentTypeId="RET_PROD_ITEM"/>
     <ReturnItemType description="Return Digital Good Item" returnItemTypeId="RET_DPROD_ITEM" parentTypeId="RET_PROD_ITEM"/>
     <ReturnItemType description="Return Finished/Digital Good Item" returnItemTypeId="RET_FDPROD_ITEM" parentTypeId="RET_PROD_ITEM"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml Mon Apr 30 10:52:55 2018
@@ -55,9 +55,9 @@ under the License.
     <ContactMechPurposeType contactMechPurposeTypeId="FACEBOOK_URL" description="Facebook Website URL"/>
     <ContactMechPurposeType contactMechPurposeTypeId="LINKEDIN_URL" description="LinkedIn Website URL"/>
 
-    <ContactMechType contactMechTypeId="ELECTRONIC_ADDRESS" description="Electronic Address" hasTable="N" parentTypeId=""/>
-    <ContactMechType contactMechTypeId="POSTAL_ADDRESS" description="Postal Address" hasTable="Y" parentTypeId=""/>
-    <ContactMechType contactMechTypeId="TELECOM_NUMBER" description="Phone Number" hasTable="Y" parentTypeId=""/>
+    <ContactMechType contactMechTypeId="ELECTRONIC_ADDRESS" description="Electronic Address" hasTable="N"/>
+    <ContactMechType contactMechTypeId="POSTAL_ADDRESS" description="Postal Address" hasTable="Y"/>
+    <ContactMechType contactMechTypeId="TELECOM_NUMBER" description="Phone Number" hasTable="Y"/>
     <ContactMechType contactMechTypeId="EMAIL_ADDRESS" description="Email Address" hasTable="N" parentTypeId="ELECTRONIC_ADDRESS"/>
     <ContactMechType contactMechTypeId="IP_ADDRESS" description="Internet IP Address" hasTable="N" parentTypeId="ELECTRONIC_ADDRESS"/>
     <ContactMechType contactMechTypeId="DOMAIN_NAME" description="Internet Domain Name" hasTable="N" parentTypeId="ELECTRONIC_ADDRESS"/>
@@ -100,31 +100,31 @@ under the License.
     <ContactMechTypePurpose contactMechPurposeTypeId="LINKEDIN_URL" contactMechTypeId="WEB_ADDRESS"/>
     
     <!-- communication events -->
-    <CommunicationEventPrpTyp communicationEventPrpTypId="ACTIVITY_REQUEST" description="Activity Request" hasTable="N" parentTypeId=""/>
-    <CommunicationEventPrpTyp communicationEventPrpTypId="CONFERENCE" description="Conference" hasTable="N" parentTypeId=""/>
-    <CommunicationEventPrpTyp communicationEventPrpTypId="CUSTOMER_SERVICE_CAL" description="Customer Service Call" hasTable="N" parentTypeId=""/>
-    <CommunicationEventPrpTyp communicationEventPrpTypId="INQUIRY" description="Inquiry" hasTable="N" parentTypeId=""/>
-    <CommunicationEventPrpTyp communicationEventPrpTypId="MEETING" description="Meeting" hasTable="N" parentTypeId=""/>
-    <CommunicationEventPrpTyp communicationEventPrpTypId="SALES_FOLLOW_UP" description="Sales Follow Up" hasTable="N" parentTypeId=""/>
-    <CommunicationEventPrpTyp communicationEventPrpTypId="SEMINAR" description="Seminar" hasTable="N" parentTypeId=""/>
-    <CommunicationEventPrpTyp communicationEventPrpTypId="SUPPORT_CALL" description="Support Call" hasTable="N" parentTypeId=""/>
+    <CommunicationEventPrpTyp communicationEventPrpTypId="ACTIVITY_REQUEST" description="Activity Request" hasTable="N"/>
+    <CommunicationEventPrpTyp communicationEventPrpTypId="CONFERENCE" description="Conference" hasTable="N"/>
+    <CommunicationEventPrpTyp communicationEventPrpTypId="CUSTOMER_SERVICE_CAL" description="Customer Service Call" hasTable="N"/>
+    <CommunicationEventPrpTyp communicationEventPrpTypId="INQUIRY" description="Inquiry" hasTable="N"/>
+    <CommunicationEventPrpTyp communicationEventPrpTypId="MEETING" description="Meeting" hasTable="N"/>
+    <CommunicationEventPrpTyp communicationEventPrpTypId="SALES_FOLLOW_UP" description="Sales Follow Up" hasTable="N"/>
+    <CommunicationEventPrpTyp communicationEventPrpTypId="SEMINAR" description="Seminar" hasTable="N"/>
+    <CommunicationEventPrpTyp communicationEventPrpTypId="SUPPORT_CALL" description="Support Call" hasTable="N"/>
     
-    <CommunicationEventType communicationEventTypeId="EMAIL_COMMUNICATION" description="Email" hasTable="N" parentTypeId="" contactMechTypeId="EMAIL_ADDRESS"/>
-    <CommunicationEventType communicationEventTypeId="FACE_TO_FACE_COMMUNI" description="Face-To-Face" hasTable="N" parentTypeId=""/>
-    <CommunicationEventType communicationEventTypeId="FAX_COMMUNICATION" description="Fax" hasTable="N" parentTypeId="" contactMechTypeId="TELECOM_NUMBER"/>
-    <CommunicationEventType communicationEventTypeId="LETTER_CORRESPONDENC" description="Letter" hasTable="N" parentTypeId="" contactMechTypeId="POSTAL_ADDRESS"/>
-    <CommunicationEventType communicationEventTypeId="PHONE_COMMUNICATION" description="Phone" hasTable="N" parentTypeId="" contactMechTypeId="TELECOM_NUMBER"/>
-    <CommunicationEventType communicationEventTypeId="WEB_SITE_COMMUNICATI" description="Web Site" hasTable="N" parentTypeId="" contactMechTypeId="WEB_ADDRESS"/>
-    <CommunicationEventType communicationEventTypeId="COMMENT_NOTE" description="Comment/Note" hasTable="N" parentTypeId="" contactMechTypeId="INTERNAL_PARTYID"/>
-    <CommunicationEventType communicationEventTypeId="AUTO_EMAIL_COMM" description="Auto Email" hasTable="N" parentTypeId="" contactMechTypeId="EMAIL_ADDRESS"/>
+    <CommunicationEventType communicationEventTypeId="EMAIL_COMMUNICATION" description="Email" hasTable="N" contactMechTypeId="EMAIL_ADDRESS"/>
+    <CommunicationEventType communicationEventTypeId="FACE_TO_FACE_COMMUNI" description="Face-To-Face" hasTable="N"/>
+    <CommunicationEventType communicationEventTypeId="FAX_COMMUNICATION" description="Fax" hasTable="N" contactMechTypeId="TELECOM_NUMBER"/>
+    <CommunicationEventType communicationEventTypeId="LETTER_CORRESPONDENC" description="Letter" hasTable="N" contactMechTypeId="POSTAL_ADDRESS"/>
+    <CommunicationEventType communicationEventTypeId="PHONE_COMMUNICATION" description="Phone" hasTable="N" contactMechTypeId="TELECOM_NUMBER"/>
+    <CommunicationEventType communicationEventTypeId="WEB_SITE_COMMUNICATI" description="Web Site" hasTable="N" contactMechTypeId="WEB_ADDRESS"/>
+    <CommunicationEventType communicationEventTypeId="COMMENT_NOTE" description="Comment/Note" hasTable="N" contactMechTypeId="INTERNAL_PARTYID"/>
+    <CommunicationEventType communicationEventTypeId="AUTO_EMAIL_COMM" description="Auto Email" hasTable="N" contactMechTypeId="EMAIL_ADDRESS"/>
     
     <!-- party content types -->
-    <PartyContentType description="Internal Content" parentTypeId="" partyContentTypeId="INTERNAL"/>
-    <PartyContentType description="User Defined Content"  parentTypeId="" partyContentTypeId="USERDEF"/>
-    <PartyContentType description="Logo Image URL"  parentTypeId="" partyContentTypeId="LGOIMGURL"/>
-    <PartyContentType description="Vendor Shipping Info"  parentTypeId="" partyContentTypeId="VNDSHPINF"/>
+    <PartyContentType description="Internal Content" partyContentTypeId="INTERNAL"/>
+    <PartyContentType description="User Defined Content"  partyContentTypeId="USERDEF"/>
+    <PartyContentType description="Logo Image URL"  partyContentTypeId="LGOIMGURL"/>
+    <PartyContentType description="Vendor Shipping Info"  partyContentTypeId="VNDSHPINF"/>
 
-    <EnumerationType description="Employment Status" enumTypeId="EMPLOY_STTS" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Employment Status" enumTypeId="EMPLOY_STTS" hasTable="N"/>
     <Enumeration description="Full-time Employed" enumCode="FULLTIME" enumId="EMPS_FULLTIME" sequenceId="01" enumTypeId="EMPLOY_STTS"/>
     <Enumeration description="Part-time Employed" enumCode="PARTTIME" enumId="EMPS_PARTTIME" sequenceId="02" enumTypeId="EMPLOY_STTS"/>
     <Enumeration description="Self Employed" enumCode="SELF" enumId="EMPS_SELF" sequenceId="03" enumTypeId="EMPLOY_STTS"/>
@@ -133,13 +133,13 @@ under the License.
     <Enumeration description="Student" enumCode="STUDENT" enumId="EMPS_STUDENT" sequenceId="06" enumTypeId="EMPLOY_STTS"/>
     <Enumeration description="Unemployed" enumCode="UNEMP" enumId="EMPS_UNEMP" sequenceId="07" enumTypeId="EMPLOY_STTS"/>
 
-    <EnumerationType description="Residence Status" enumTypeId="PTY_RESID_STTS" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Residence Status" enumTypeId="PTY_RESID_STTS" hasTable="N"/>
     <Enumeration description="Own Home" enumCode="OWN" enumId="PRESS_OWN" sequenceId="01" enumTypeId="PTY_RESID_STTS"/>
     <Enumeration description="Private Tenant" enumCode="PVT_TENANT" enumId="PRESS_PVT_TENANT" sequenceId="02" enumTypeId="PTY_RESID_STTS"/>
     <Enumeration description="Public Tenant" enumCode="PUB_TENANT" enumId="PRESS_PUB_TENANT" sequenceId="03" enumTypeId="PTY_RESID_STTS"/>
     <Enumeration description="With Parents" enumCode="PARENTS" enumId="PRESS_PARENTS" sequenceId="04" enumTypeId="PTY_RESID_STTS"/>
 
-    <EnumerationType description="Party Email Notification" enumTypeId="PARTY_EMAIL" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Party Email Notification" enumTypeId="PARTY_EMAIL" hasTable="N"/>
     <Enumeration description="Party Registration Confirmation" enumCode="REGIS_CONFIRM" enumId="PARTY_REGIS_CONFIRM" sequenceId="01" enumTypeId="PARTY_EMAIL"/>
     <Enumeration description="Update Personal Info Confirmation" enumCode="UPDAT_CONFIRM" enumId="UPD_PRSNL_INF_CNFRM" sequenceId="02" enumTypeId="PARTY_EMAIL"/>
     <Enumeration description="Party Email Address Verification" enumCode="EMAIL_VERIFY" enumId="PRDS_EMAIL_VERIFY" sequenceId="03" enumTypeId="PARTY_EMAIL"/>
@@ -152,42 +152,42 @@ under the License.
     <Enumeration description="Contact List E-mail Template" enumCode="CONT_EMAIL_TEMPLATE" enumId="CONT_EMAIL_TEMPLATE" sequenceId="04" enumTypeId="PARTY_EMAIL"/>
 
     <!-- the groups which are the main roles on he party listing -->
-    <RoleType description="Main Role" hasTable="N" parentTypeId="" roleTypeId="MAIN_ROLE"/>
+    <RoleType description="Main Role" hasTable="N" roleTypeId="MAIN_ROLE"/>
 
     <!-- top level role types -->
-    <RoleType description="Account Lead" hasTable="N" parentTypeId="" roleTypeId="ACCOUNT_LEAD"/>
-    <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"/>
-    <RoleType description="Calendar" hasTable="N" parentTypeId="" roleTypeId="CALENDAR_ROLE"/>
-    <RoleType description="Client" hasTable="N" parentTypeId="" roleTypeId="CLIENT"/>
-    <RoleType description="Communication Participant" hasTable="N" parentTypeId="" roleTypeId="COMMEVENT_ROLE"/>
-    <RoleType description="Consumer" hasTable="N" parentTypeId="" roleTypeId="CONSUMER"/>
-    <RoleType description="Contractor" hasTable="N" parentTypeId="" roleTypeId="CONTRACTOR"/>
-    <RoleType description="Customer" hasTable="N" parentTypeId="" roleTypeId="CUSTOMER"/>
-    <RoleType description="Distribution Channel" hasTable="N" parentTypeId="" roleTypeId="DISTRIBUTION_CHANNEL"/>
-    <RoleType description="ISP" hasTable="N" parentTypeId="" roleTypeId="ISP"/>
-    <RoleType description="Hosting Server" hasTable="N" parentTypeId="" roleTypeId="HOSTING_SERVER"/>
-    <RoleType description="Manufacturer" hasTable="N" parentTypeId="" roleTypeId="MANUFACTURER"/>
-    <RoleType description="Not Applicable" hasTable="N" parentTypeId="" roleTypeId="_NA_"/>
+    <RoleType description="Account Lead" hasTable="N" roleTypeId="ACCOUNT_LEAD"/>
+    <RoleType description="Administrator" hasTable="N" roleTypeId="ADMIN"/>
+    <RoleType description="Agent" hasTable="N" roleTypeId="AGENT"/>
+    <RoleType description="Automated Agent" hasTable="N" roleTypeId="AUTOMATED_AGENT_ROLE"/>
+    <RoleType description="Calendar" hasTable="N" roleTypeId="CALENDAR_ROLE"/>
+    <RoleType description="Client" hasTable="N" roleTypeId="CLIENT"/>
+    <RoleType description="Communication Participant" hasTable="N" roleTypeId="COMMEVENT_ROLE"/>
+    <RoleType description="Consumer" hasTable="N" roleTypeId="CONSUMER"/>
+    <RoleType description="Contractor" hasTable="N" roleTypeId="CONTRACTOR"/>
+    <RoleType description="Customer" hasTable="N" roleTypeId="CUSTOMER"/>
+    <RoleType description="Distribution Channel" hasTable="N" roleTypeId="DISTRIBUTION_CHANNEL"/>
+    <RoleType description="ISP" hasTable="N" roleTypeId="ISP"/>
+    <RoleType description="Hosting Server" hasTable="N" roleTypeId="HOSTING_SERVER"/>
+    <RoleType description="Manufacturer" hasTable="N" roleTypeId="MANUFACTURER"/>
+    <RoleType description="Not Applicable" hasTable="N" roleTypeId="_NA_"/>
     <RoleType description="Organization" hasTable="N" parentTypeId="MAIN_ROLE" roleTypeId="ORGANIZATION_ROLE"/>
-    <RoleType description="Owner" hasTable="N"  parentTypeId="" roleTypeId="OWNER"/>
-    <RoleType description="Prospect" hasTable="N" parentTypeId="" roleTypeId="PROSPECT"/>
-    <RoleType description="Person" hasTable="N" parentTypeId="" roleTypeId="PERSON_ROLE"/>
-    <RoleType description="Referrer" hasTable="N" parentTypeId="" roleTypeId="REFERRER"/>
-    <RoleType description="Request Role" hasTable="N" parentTypeId="" roleTypeId="REQUEST_ROLE"/>
+    <RoleType description="Owner" hasTable="N"  roleTypeId="OWNER"/>
+    <RoleType description="Prospect" hasTable="N" roleTypeId="PROSPECT"/>
+    <RoleType description="Person" hasTable="N" roleTypeId="PERSON_ROLE"/>
+    <RoleType description="Referrer" hasTable="N" roleTypeId="REFERRER"/>
+    <RoleType description="Request Role" hasTable="N" roleTypeId="REQUEST_ROLE"/>
     <RoleType description="Request Manager" hasTable="N" parentTypeId="REQUEST_ROLE" roleTypeId="REQ_MANAGER"/>
     <RoleType description="Requesting Party" hasTable="N" parentTypeId="REQUEST_ROLE" roleTypeId="REQ_REQUESTER"/>
     <RoleType description="Request Taker" hasTable="N" parentTypeId="REQUEST_ROLE" roleTypeId="REQ_TAKER"/>
     <RoleType description="Request Respondent" hasTable="N" parentTypeId="REQUEST_ROLE" roleTypeId="REQ_RESPOND"/>
     <RoleType description="Sales Force Autm." hasTable="N" parentTypeId="MAIN_ROLE" roleTypeId="SFA_ROLE"/>
-    <RoleType description="Shareholder" hasTable="N" parentTypeId="" roleTypeId="SHAREHOLDER"/>
-    <RoleType description="Subscriber" hasTable="N" parentTypeId="" roleTypeId="SUBSCRIBER"/>
-    <RoleType description="Vendor" hasTable="N" parentTypeId="" roleTypeId="VENDOR"/>
-    <RoleType description="Visitor" hasTable="N" parentTypeId="" roleTypeId="VISITOR"/>
-    <RoleType description="Web Master" hasTable="N" parentTypeId="" roleTypeId="WEB_MASTER"/>
-    <RoleType description="Workflow" hasTable="N" parentTypeId="" roleTypeId="WORKFLOW_ROLE"/>
-    <RoleType description="Accountant" hasTable="N" parentTypeId="" roleTypeId="ACCOUNTANT"/>
+    <RoleType description="Shareholder" hasTable="N" roleTypeId="SHAREHOLDER"/>
+    <RoleType description="Subscriber" hasTable="N" roleTypeId="SUBSCRIBER"/>
+    <RoleType description="Vendor" hasTable="N" roleTypeId="VENDOR"/>
+    <RoleType description="Visitor" hasTable="N" roleTypeId="VISITOR"/>
+    <RoleType description="Web Master" hasTable="N" roleTypeId="WEB_MASTER"/>
+    <RoleType description="Workflow" hasTable="N" roleTypeId="WORKFLOW_ROLE"/>
+    <RoleType description="Accountant" hasTable="N" roleTypeId="ACCOUNTANT"/>
 
     <!-- second level role types -->
     <RoleType description="Account" hasTable="N" parentTypeId="SFA_ROLE" roleTypeId="ACCOUNT"/>
@@ -251,56 +251,56 @@ under the License.
 
     <RoleType description="Email Administrator" hasTable="N" parentTypeId="PERSON_ROLE" roleTypeId="EMAIL_ADMIN"/>
 
-    <PartyClassificationType description="EEOC (Equal Opportunity)" hasTable="N" parentTypeId="" partyClassificationTypeId="EEOC_CLASSIFICATION"/>
-    <PartyClassificationType description="Minority" hasTable="N" parentTypeId="" partyClassificationTypeId="MINORITY_CLASSIFICAT"/>
-    <PartyClassificationType description="Income" hasTable="N" parentTypeId="" partyClassificationTypeId="INCOME_CLASSIFICATIO"/>
-    <PartyClassificationType description="Industry" hasTable="N" parentTypeId="" partyClassificationTypeId="INDUSTRY_CLASSIFICAT"/>
-    <PartyClassificationType description="Organization" hasTable="N" parentTypeId="" partyClassificationTypeId="ORGANIZATION_CLASSIF"/>
-    <PartyClassificationType description="Person" hasTable="N" parentTypeId="" partyClassificationTypeId="PERSON_CLASSIFICATIO"/>
-    <PartyClassificationType description="Size" hasTable="N" parentTypeId="" partyClassificationTypeId="SIZE_CLASSIFICATION"/>
-    <PartyClassificationType description="Trade" hasTable="N" parentTypeId="" partyClassificationTypeId="TRADE_CLASSIFICATION"/>
+    <PartyClassificationType description="EEOC (Equal Opportunity)" hasTable="N" partyClassificationTypeId="EEOC_CLASSIFICATION"/>
+    <PartyClassificationType description="Minority" hasTable="N" partyClassificationTypeId="MINORITY_CLASSIFICAT"/>
+    <PartyClassificationType description="Income" hasTable="N" partyClassificationTypeId="INCOME_CLASSIFICATIO"/>
+    <PartyClassificationType description="Industry" hasTable="N" partyClassificationTypeId="INDUSTRY_CLASSIFICAT"/>
+    <PartyClassificationType description="Organization" hasTable="N" partyClassificationTypeId="ORGANIZATION_CLASSIF"/>
+    <PartyClassificationType description="Person" hasTable="N" partyClassificationTypeId="PERSON_CLASSIFICATIO"/>
+    <PartyClassificationType description="Size" hasTable="N" partyClassificationTypeId="SIZE_CLASSIFICATION"/>
+    <PartyClassificationType description="Trade" hasTable="N" 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"/>
+    <PartyClassificationType description="Annual Revenue" hasTable="N" partyClassificationTypeId="ANNUAL_REVENUE"/>
+    <PartyClassificationType description="Number of Employees" hasTable="N" partyClassificationTypeId="NUMBER_OF_EMPLOYEES"/>
+    <PartyClassificationType description="Value Rating" hasTable="N" partyClassificationTypeId="VALUE_RATING"/>
+    <PartyClassificationType description="SIC Code" hasTable="N" partyClassificationTypeId="SIC_CODE"/>
+    <PartyClassificationType description="Ownership" hasTable="N" partyClassificationTypeId="OWNERSHIP"/>
+
+    <PartyQualType description="Work experience" hasTable="N" partyQualTypeId="EXPERIENCE"/>
+    <PartyQualType description="Certification" hasTable="N" partyQualTypeId="CERTIFICATION"/>
+    <PartyQualType description="Degree" hasTable="N" partyQualTypeId="DEGREE"/>
 
     <!-- NOTE: The partyRelationshipName describes the TO party, ie A is a customer of B, so A is the partyTo and B is the partyFrom -->
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Agent" partyRelationshipTypeId="AGENT" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Child" partyRelationshipTypeId="CHILD" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Contact Relation" partyRelationshipTypeId="CONTACT_REL" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Lead Relation" partyRelationshipTypeId="LEAD_REL" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Lead Owned by" partyRelationshipTypeId="LEAD_OWNER" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Customer" partyRelationshipTypeId="CUSTOMER_REL" roleTypeIdValidFrom="CUSTOMER" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Distributor" partyRelationshipTypeId="DISTRIBUTION_CHANNEL" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="Y" parentTypeId="" partyRelationshipName="Employee" partyRelationshipTypeId="EMPLOYMENT" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Friend" partyRelationshipTypeId="FRIEND" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Group Member" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Host Server Visitor" partyRelationshipTypeId="HOST_SERVER_VISITOR" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="ISP Visitor" partyRelationshipTypeId="VISITOR_ISP" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Manager" partyRelationshipTypeId="MANAGER" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Parent" partyRelationshipTypeId="PARENT" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Partner" partyRelationshipTypeId="PARTNERSHIP" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Sales Affiliate" partyRelationshipTypeId="SALES_AFFILIATE" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Spouse" partyRelationshipTypeId="SPOUSE" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="Y" 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 owned by" partyRelationshipTypeId="ACCOUNT" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Assistant" partyRelationshipTypeId="ASSISTANT" roleTypeIdValidFrom="" roleTypeIdValidTo=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Owned by" 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=""/>
-    <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Lead Owners/Managers" partyRelationshipTypeId="LEAD_OWN_GRP_MEMBER" 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"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Agent" partyRelationshipTypeId="AGENT"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Child" partyRelationshipTypeId="CHILD"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Contact Relation" partyRelationshipTypeId="CONTACT_REL"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Lead Relation" partyRelationshipTypeId="LEAD_REL"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Lead Owned by" partyRelationshipTypeId="LEAD_OWNER"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Customer" partyRelationshipTypeId="CUSTOMER_REL" roleTypeIdValidFrom="CUSTOMER"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Distributor" partyRelationshipTypeId="DISTRIBUTION_CHANNEL"/>
+    <PartyRelationshipType hasTable="Y" partyRelationshipName="Employee" partyRelationshipTypeId="EMPLOYMENT"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Friend" partyRelationshipTypeId="FRIEND"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Group Member" partyRelationshipTypeId="GROUP_ROLLUP"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Host Server Visitor" partyRelationshipTypeId="HOST_SERVER_VISITOR"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="ISP Visitor" partyRelationshipTypeId="VISITOR_ISP"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Manager" partyRelationshipTypeId="MANAGER"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Parent" partyRelationshipTypeId="PARENT"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Partner" partyRelationshipTypeId="PARTNERSHIP"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Sales Affiliate" partyRelationshipTypeId="SALES_AFFILIATE"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Spouse" partyRelationshipTypeId="SPOUSE"/>
+    <PartyRelationshipType hasTable="Y" partyRelationshipName="Supplier" partyRelationshipTypeId="SUPPLIER_REL"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Web Master" partyRelationshipTypeId="WEB_MASTER_ASSIGNMEN"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Account owned by" partyRelationshipTypeId="ACCOUNT"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Assistant" partyRelationshipTypeId="ASSISTANT"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Owned by" partyRelationshipTypeId="OWNER"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Parent Account" partyRelationshipTypeId="PARENT_ACCOUNT"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Reports To" partyRelationshipTypeId="REPORTS_TO"/>
+    <PartyRelationshipType hasTable="N" partyRelationshipName="Lead Owners/Managers" partyRelationshipTypeId="LEAD_OWN_GRP_MEMBER"/>
+
+    <PartyType description="Automated Agent" hasTable="N" partyTypeId="AUTOMATED_AGENT"/>
+    <PartyType description="Person" hasTable="Y" partyTypeId="PERSON"/>
+    <PartyType description="Party Group" hasTable="Y" partyTypeId="PARTY_GROUP"/>
     <PartyType description="Informal Group" hasTable="N" parentTypeId="PARTY_GROUP" partyTypeId="INFORMAL_GROUP"/>
     <PartyType description="Family" hasTable="N" parentTypeId="INFORMAL_GROUP" partyTypeId="FAMILY"/>
     <PartyType description="Team" hasTable="N" parentTypeId="INFORMAL_GROUP" partyTypeId="TEAM"/>
@@ -308,15 +308,15 @@ under the License.
     <PartyType description="Corporation" hasTable="N" parentTypeId="LEGAL_ORGANIZATION" partyTypeId="CORPORATION"/>
     <PartyType description="Government Agency" hasTable="N" parentTypeId="LEGAL_ORGANIZATION" partyTypeId="GOVERNMENT_AGENCY"/>
 
-    <StatusType description="Party" hasTable="N" parentTypeId="" statusTypeId="PARTY_STATUS"/>
+    <StatusType description="Party" hasTable="N" statusTypeId="PARTY_STATUS"/>
     <StatusItem description="Enabled" sequenceId="01" statusCode="ENABLED" statusId="PARTY_ENABLED" statusTypeId="PARTY_STATUS"/>
     <StatusItem description="Disabled" sequenceId="99" statusCode="DISABLED" statusId="PARTY_DISABLED" statusTypeId="PARTY_STATUS"/>
     <StatusValidChange statusId="PARTY_ENABLED" statusIdTo="PARTY_DISABLED" transitionName="Disable"/>
     <StatusValidChange statusId="PARTY_DISABLED" statusIdTo="PARTY_ENABLED" transitionName="Re-Enable"/>
     
-    <StatusType description="Case" hasTable="N" parentTypeId="" statusTypeId="CASE_STATUS"/>
+    <StatusType description="Case" hasTable="N" statusTypeId="CASE_STATUS"/>
 
-    <StatusType description="Communication Event" hasTable="N" parentTypeId="" statusTypeId="COM_EVENT_STATUS"/>
+    <StatusType description="Communication Event" hasTable="N" statusTypeId="COM_EVENT_STATUS"/>
     <StatusItem description="Pending" sequenceId="01" statusCode="PENDING" statusId="COM_PENDING" statusTypeId="COM_EVENT_STATUS"/><!-- draft version, only visible by originator -->
     <StatusItem description="Entered" sequenceId="02" statusCode="ENTERED" statusId="COM_ENTERED" statusTypeId="COM_EVENT_STATUS"/>
     <!--StatusItem description="Read" sequenceId="03" statusCode="READ" statusId="COM_READ" statusTypeId="COM_EVENT_STATUS"/--><!-- the read status is maintained at the comm-role level; can be diffrent for all participants-->
@@ -357,12 +357,12 @@ under the License.
     <StatusValidChange statusId="COM_ROLE_CREATED" statusIdTo="COM_ROLE_COMPLETED" transitionName="Completed"/>
     <StatusValidChange statusId="COM_ROLE_READ" statusIdTo="COM_ROLE_COMPLETED" transitionName="Completed"/>
 
-    <StatusType description="Party Relationship" hasTable="N" parentTypeId="" statusTypeId="PARTY_REL_STATUS"/>
+    <StatusType description="Party Relationship" hasTable="N" statusTypeId="PARTY_REL_STATUS"/>
     <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="PARTYREL_CREATED" statusTypeId="PARTY_REL_STATUS"/>
     <StatusItem description="Expired" sequenceId="02" statusCode="EXPIRED" statusId="PARTYREL_EXPIRED" statusTypeId="PARTY_REL_STATUS"/>
     <StatusValidChange statusId="PARTYREL_CREATED" statusIdTo="PARTYREL_EXPIRED" transitionName="Expired"/>
     
-    <StatusType description="Party Invitation" hasTable="N" parentTypeId="" statusTypeId="PARTY_INV_STATUS"/>
+    <StatusType description="Party Invitation" hasTable="N" statusTypeId="PARTY_INV_STATUS"/>
     <StatusItem description="Invitation Sent" sequenceId="01" statusCode="SENT" statusId="PARTYINV_SENT" statusTypeId="PARTY_INV_STATUS"/>
     <StatusItem description="Invitation Pending" sequenceId="02" statusCode="PENDING" statusId="PARTYINV_PENDING" statusTypeId="PARTY_INV_STATUS"/>
     <StatusItem description="Invitation Accepted" sequenceId="05" statusCode="ACCEPTED" statusId="PARTYINV_ACCEPTED" statusTypeId="PARTY_INV_STATUS"/>
@@ -375,7 +375,7 @@ under the License.
     <StatusValidChange statusId="PARTYINV_PENDING" statusIdTo="PARTYINV_ACCEPTED" transitionName="Accepted"/>
     <StatusValidChange statusId="PARTYINV_PENDING" statusIdTo="PARTYINV_CANCELLED" transitionName="Cancelled"/>
 
-    <TermType description="Financial" hasTable="N" parentTypeId="" termTypeId="FINANCIAL_TERM"/>
+    <TermType description="Financial" hasTable="N" termTypeId="FINANCIAL_TERM"/>
     <TermType description="Payment (net days)" hasTable="N" parentTypeId="FINANCIAL_TERM" termTypeId="FIN_PAYMENT_TERM"/>
     <TermType description="Payment net days, part 1" hasTable="N" parentTypeId="FIN_PAYMENT_TERM" termTypeId="FIN_PAY_NETDAYS_1"/>
     <TermType description="Payment net days, part 2" hasTable="N" parentTypeId="FIN_PAYMENT_TERM" termTypeId="FIN_PAY_NETDAYS_2"/>
@@ -385,22 +385,22 @@ under the License.
     <TermType description="Late Fee (percent)" hasTable="N" parentTypeId="FINANCIAL_TERM" termTypeId="FIN_LATE_FEE_TERM"/>
     <TermType description="Penalty For Collection Agency" hasTable="N" parentTypeId="FINANCIAL_TERM" termTypeId="FIN_COLLECT_TERM"/>
     <TermType description="Non-Returnable Sales Item" hasTable="N" parentTypeId="FINANCIAL_TERM" termTypeId="FIN_NORTN_ITEM_TERM"/>
-    <TermType description="Incentive" hasTable="N" parentTypeId="" termTypeId="INCENTIVE"/>
-    <TermType description="Legal" hasTable="N" parentTypeId="" termTypeId="LEGAL_TERM"/>
-    <TermType description="Threshold" hasTable="N" parentTypeId="" termTypeId="THRESHOLD"/>
-    <TermType description="Clause For Renewal" hasTable="N" parentTypeId="" termTypeId="CLAUSE_FOR_RENEWAL"/>
-    <TermType description="Agreement Termination" hasTable="N" parentTypeId="" termTypeId="AGREEMENT_TERMINATIO"/>
-    <TermType description="Indemnification" hasTable="N" parentTypeId="" termTypeId="INDEMNIFICATION"/>
-    <TermType description="Non-Compete" hasTable="N" parentTypeId="" termTypeId="NON_COMPETE"/>
-    <TermType description="Exclusive Relationship" hasTable="N" parentTypeId="" termTypeId="EXCLUSIVE_RELATIONSH"/>
+    <TermType description="Incentive" hasTable="N" termTypeId="INCENTIVE"/>
+    <TermType description="Legal" hasTable="N" termTypeId="LEGAL_TERM"/>
+    <TermType description="Threshold" hasTable="N" termTypeId="THRESHOLD"/>
+    <TermType description="Clause For Renewal" hasTable="N" termTypeId="CLAUSE_FOR_RENEWAL"/>
+    <TermType description="Agreement Termination" hasTable="N" termTypeId="AGREEMENT_TERMINATIO"/>
+    <TermType description="Indemnification" hasTable="N" termTypeId="INDEMNIFICATION"/>
+    <TermType description="Non-Compete" hasTable="N" termTypeId="NON_COMPETE"/>
+    <TermType description="Exclusive Relationship" hasTable="N" termTypeId="EXCLUSIVE_RELATIONSH"/>
 
-    <TermType description="Commission" hasTable="N" parentTypeId="" termTypeId="COMMISSION_TERM"/>
+    <TermType description="Commission" hasTable="N" termTypeId="COMMISSION_TERM"/>
     <TermType description="Commission Term Fixed Per Unit" hasTable="N" parentTypeId="COMMISSION_TERM" termTypeId="FIN_COMM_FIXED"/>
     <TermType description="Commission Term Variable" hasTable="N" parentTypeId="COMMISSION_TERM" termTypeId="FIN_COMM_VARIABLE"/>
     <TermType description="Commission Term Minimum Per Unit" hasTable="N" parentTypeId="COMMISSION_TERM" termTypeId="FIN_COMM_MIN"/>
     <TermType description="Commission Term Maximum Per Unit" hasTable="N" parentTypeId="COMMISSION_TERM" termTypeId="FIN_COMM_MAX"/>
 
-    <TermType description="Incoterm" hasTable="N" parentTypeId="" termTypeId="INCO_TERM"/>
+    <TermType description="Incoterm" hasTable="N" termTypeId="INCO_TERM"/>
     <TermType description="Incoterm Ex Works" parentTypeId="INCO_TERM" termTypeId="EXW"/>
     <TermType description="Incoterm Free Carrier" parentTypeId="INCO_TERM" termTypeId="FCA"/>
     <TermType description="Incoterm Free Alongside Ship" parentTypeId="INCO_TERM" termTypeId="FAS"/>
@@ -415,19 +415,19 @@ under the License.
     <TermType description="Incoterm Delivered Duty Unpaid" parentTypeId="INCO_TERM" termTypeId="DDU"/>
     <TermType description="Incoterm Delivered Duty Paid" parentTypeId="INCO_TERM" termTypeId="DDP"/>
 
-    <TermType description="Purchasing" parentTypeId="" hasTable="" termTypeId="PURCHASING"/>
+    <TermType description="Purchasing" termTypeId="PURCHASING"/>
     <TermType description="Vendor Customer ID" parentTypeId="PURCHASING" termTypeId="PURCH_VENDOR_ID"/>
     <TermType description="Preferred Freight" parentTypeId="PURCHASING" termTypeId="PURCH_FREIGHT"/>
 
-    <TermType description="Other" hasTable="N" parentTypeId="" termTypeId="OTHER_TERM"/>
+    <TermType description="Other" hasTable="N" termTypeId="OTHER_TERM"/>
 
     <!-- User preferences data -->
     <UserPreference userLoginId="_NA_" userPrefTypeId="ORGANIZATION_PARTY" userPrefGroupTypeId="GLOBAL_PREFERENCES" userPrefValue="DEFAULT"/>
 
-    <EnumerationType description="User preference groups" enumTypeId="USER_PREF_GROUPS" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="User preference groups" enumTypeId="USER_PREF_GROUPS" hasTable="N"/>
     <EnumerationType description="Global preferences" enumTypeId="GLOBAL_PREFERENCES" hasTable="N" parentTypeId="USER_PREF_GROUPS"/>
-    <Enumeration description="Organization party" enumCode="" enumId="ORGANIZATION_PARTY" sequenceId="01" enumTypeId="GLOBAL_PREFERENCES"/>
-    <Enumeration description="Visual Theme" enumCode="" enumId="VISUAL_THEME" sequenceId="02" enumTypeId="GLOBAL_PREFERENCES"/>
+    <Enumeration description="Organization party" enumId="ORGANIZATION_PARTY" sequenceId="01" enumTypeId="GLOBAL_PREFERENCES"/>
+    <Enumeration description="Visual Theme" enumId="VISUAL_THEME" sequenceId="02" enumTypeId="GLOBAL_PREFERENCES"/>
 
     <PartyIdentificationType partyIdentificationTypeId="PARTY_IMPORT" description="Original ID in the system where this record was imported from"/>