svn commit: r1796379 [3/8] - in /ofbiz: ofbiz-framework/trunk/applicat
Locked
svn commit: r1796379 [3/8] - in /ofbiz: ofbiz-framework/trunk/applicat
 
|
Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml?rev=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml Sat May 27 11:28:36 2017 @@ -150,7 +150,7 @@ under the License. package-name="org.apache.ofbiz.content.content" default-resource-name="ContentEntityLabels" title="Content Entity"> - <field name="contentId" type="id-ne"></field> + <field name="contentId" type="id"></field> <field name="contentTypeId" type="id"></field> <field name="ownerContentId" type="id"><description>Used for permissions checking</description></field> <field name="decoratorContentId" type="id"></field> @@ -250,7 +250,7 @@ under the License. <entity entity-name="ContentApproval" package-name="org.apache.ofbiz.content.content" title="Content Approval Entity"> - <field name="contentApprovalId" type="id-ne"></field> + <field name="contentApprovalId" type="id"></field> <field name="contentId" type="id-ne"></field> <field name="contentRevisionSeqId" type="id-ne"></field> <field name="partyId" type="id-ne"></field> @@ -280,8 +280,8 @@ under the License. <entity entity-name="ContentAssoc" package-name="org.apache.ofbiz.content.content" title="Content Association Entity"> - <field name="contentId" type="id-ne"><description>"parent" content</description></field> - <field name="contentIdTo" type="id-ne"><description>"child" or "sub" content</description></field> + <field name="contentId" type="id"><description>"parent" content</description></field> + <field name="contentIdTo" type="id"><description>"child" or "sub" content</description></field> <field name="contentAssocTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -417,7 +417,7 @@ under the License. package-name="org.apache.ofbiz.content.content" default-resource-name="ContentEntityLabels" title="Content Association Predicate Entity"> - <field name="contentAssocPredicateId" type="id-ne"></field> + <field name="contentAssocPredicateId" type="id"></field> <field name="description" type="description"></field> <prim-key field="contentAssocPredicateId"/> </entity> @@ -425,7 +425,7 @@ under the License. package-name="org.apache.ofbiz.content.content" default-resource-name="ContentEntityLabels" title="Content Association Type Entity"> - <field name="contentAssocTypeId" type="id-ne"></field> + <field name="contentAssocTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="contentAssocTypeId"/> </entity> @@ -460,8 +460,8 @@ under the License. <entity entity-name="ContentAttribute" package-name="org.apache.ofbiz.content.content" title="Content Attribute Entity"> - <field name="contentId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="contentId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="attrValue" type="value"></field> <field name="attrDescription" type="description"></field> <prim-key field="contentId"/> @@ -514,8 +514,8 @@ under the License. <entity entity-name="ContentMetaData" package-name="org.apache.ofbiz.content.content" title="Content Meta-Data Predicate Entity"> - <field name="contentId" type="id-ne"></field> - <field name="metaDataPredicateId" type="id-ne"></field> + <field name="contentId" type="id"></field> + <field name="metaDataPredicateId" type="id"></field> <field name="metaDataValue" type="value"></field> <field name="dataSourceId" type="id"></field> <prim-key field="contentId"/> @@ -534,15 +534,15 @@ under the License. package-name="org.apache.ofbiz.content.content" default-resource-name="ContentEntityLabels" title="Content Operation Entity"> - <field name="contentOperationId" type="id-ne"></field> + <field name="contentOperationId" type="id"></field> <field name="description" type="description"></field> <prim-key field="contentOperationId"/> </entity> <entity entity-name="ContentPurpose" package-name="org.apache.ofbiz.content.content" title="Content Purpose Entity"> - <field name="contentId" type="id-ne"></field> - <field name="contentPurposeTypeId" type="id-ne"></field> + <field name="contentId" type="id"></field> + <field name="contentPurposeTypeId" type="id"></field> <field name="sequenceNum" type="numeric"></field> <prim-key field="contentId"/> <prim-key field="contentPurposeTypeId"/> @@ -556,11 +556,11 @@ under the License. <entity entity-name="ContentPurposeOperation" package-name="org.apache.ofbiz.content.content" title="Content Purpose Entity"> - <field name="contentPurposeTypeId" type="id-ne"></field> - <field name="contentOperationId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> - <field name="statusId" type="id-ne"></field> - <field name="privilegeEnumId" type="id-ne"></field> + <field name="contentPurposeTypeId" type="id"></field> + <field name="contentOperationId" type="id"></field> + <field name="roleTypeId" type="id"></field> + <field name="statusId" type="id"></field> + <field name="privilegeEnumId" type="id"></field> <prim-key field="contentPurposeTypeId"/> <prim-key field="contentOperationId"/> <prim-key field="roleTypeId"/> @@ -586,15 +586,15 @@ under the License. package-name="org.apache.ofbiz.content.content" default-resource-name="ContentEntityLabels" title="Content Purpose Type Entity"> - <field name="contentPurposeTypeId" type="id-ne"></field> + <field name="contentPurposeTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="contentPurposeTypeId"/> </entity> <entity entity-name="ContentRevision" package-name="org.apache.ofbiz.content.content" title="Content Revision Entity"> - <field name="contentId" type="id-ne"></field> - <field name="contentRevisionSeqId" type="id-ne"></field> + <field name="contentId" type="id"></field> + <field name="contentRevisionSeqId" type="id"></field> <field name="committedByPartyId" type="id-ne"></field> <field name="comments" type="comment"></field> <prim-key field="contentId"/> @@ -609,9 +609,9 @@ under the License. <entity entity-name="ContentRevisionItem" package-name="org.apache.ofbiz.content.content" title="Content Revision Entity"> - <field name="contentId" type="id-ne"></field> - <field name="contentRevisionSeqId" type="id-ne"></field> - <field name="itemContentId" type="id-ne"></field> + <field name="contentId" type="id"></field> + <field name="contentRevisionSeqId" type="id"></field> + <field name="itemContentId" type="id"></field> <field name="oldDataResourceId" type="id-ne"></field> <field name="newDataResourceId" type="id-ne"></field> <prim-key field="contentId"/> @@ -631,9 +631,9 @@ under the License. <entity entity-name="ContentRole" package-name="org.apache.ofbiz.content.content" title="Content Role Entity"> - <field name="contentId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="contentId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="contentId"/> @@ -655,8 +655,8 @@ under the License. package-name="org.apache.ofbiz.content.content" default-resource-name="ContentEntityLabels" title="Content Type Entity"> - <field name="contentTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="contentTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="contentTypeId"/> @@ -667,8 +667,8 @@ under the License. <entity entity-name="ContentTypeAttr" package-name="org.apache.ofbiz.content.content" title="Content Type Attribute Entity"> - <field name="contentTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="contentTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="contentTypeId"/> <prim-key field="attrName"/> @@ -728,7 +728,7 @@ under the License. <entity entity-name="AudioDataResource" package-name="org.apache.ofbiz.content.data" title="Audio Data Object Entity"> - <field name="dataResourceId" type="id-ne"></field> + <field name="dataResourceId" type="id"></field> <field name="audioData" type="byte-array"></field> <prim-key field="dataResourceId"/> <relation type="one" fk-name="DATA_REC_AUDIO" rel-entity-name="DataResource"> @@ -739,7 +739,7 @@ under the License. package-name="org.apache.ofbiz.content.data" default-resource-name="ContentEntityLabels" title="Character Set Entity"> - <field name="characterSetId" type="id-long-ne"></field> + <field name="characterSetId" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="characterSetId"/> </entity> @@ -747,7 +747,7 @@ under the License. package-name="org.apache.ofbiz.content.data" default-resource-name="ContentEntityLabels" title="Data Category Entity"> - <field name="dataCategoryId" type="id-ne"></field> + <field name="dataCategoryId" type="id"></field> <field name="parentCategoryId" type="id"></field> <field name="categoryName" type="name"></field> <prim-key field="dataCategoryId"/> @@ -761,7 +761,7 @@ under the License. <entity entity-name="DataResource" package-name="org.apache.ofbiz.content.data" title="Data Object Entity"> - <field name="dataResourceId" type="id-ne"></field> + <field name="dataResourceId" type="id"></field> <field name="dataResourceTypeId" type="id"></field> <field name="dataTemplateTypeId" type="id"></field> <field name="dataCategoryId" type="id-ne"></field> @@ -822,8 +822,8 @@ under the License. <entity entity-name="DataResourceAttribute" package-name="org.apache.ofbiz.content.data" title="Data Object Attribute Entity"> - <field name="dataResourceId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="dataResourceId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="attrValue" type="value"></field> <field name="attrDescription" type="description"></field> <prim-key field="dataResourceId"/> @@ -888,8 +888,8 @@ under the License. <entity entity-name="DataResourceMetaData" package-name="org.apache.ofbiz.content.data" title="Data Resource Meta-Data Predicate Entity"> - <field name="dataResourceId" type="id-ne"></field> - <field name="metaDataPredicateId" type="id-ne"></field> + <field name="dataResourceId" type="id"></field> + <field name="metaDataPredicateId" type="id"></field> <field name="metaDataValue" type="value"></field> <field name="dataSourceId" type="id"></field> <prim-key field="dataResourceId"/> @@ -907,8 +907,8 @@ under the License. <entity entity-name="DataResourcePurpose" package-name="org.apache.ofbiz.content.data" title="Data Object Purpose Entity"> - <field name="dataResourceId" type="id-ne"></field> - <field name="contentPurposeTypeId" type="id-ne"></field> + <field name="dataResourceId" type="id"></field> + <field name="contentPurposeTypeId" type="id"></field> <prim-key field="dataResourceId"/> <prim-key field="contentPurposeTypeId"/> <relation type="one" fk-name="DATA_REC_PRP" rel-entity-name="DataResource"> @@ -921,9 +921,9 @@ under the License. <entity entity-name="DataResourceRole" package-name="org.apache.ofbiz.content.data" title="DataResource Role Entity"> - <field name="dataResourceId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="dataResourceId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="dataResourceId"/> @@ -945,8 +945,8 @@ under the License. package-name="org.apache.ofbiz.content.data" default-resource-name="ContentEntityLabels" title="Data Object Type Entity"> - <field name="dataResourceTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="dataResourceTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="dataResourceTypeId"/> @@ -957,8 +957,8 @@ under the License. <entity entity-name="DataResourceTypeAttr" package-name="org.apache.ofbiz.content.data" title="Data Object Type Attribute Entity"> - <field name="dataResourceTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="dataResourceTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="dataResourceTypeId"/> <prim-key field="attrName"/> @@ -976,7 +976,7 @@ under the License. package-name="org.apache.ofbiz.content.data" default-resource-name="ContentEntityLabels" title="Data Template Type Entity"> - <field name="dataTemplateTypeId" type="id-ne"></field> + <field name="dataTemplateTypeId" type="id"></field> <field name="description" type="description"></field> <field name="extension" type="short-varchar"></field> <prim-key field="dataTemplateTypeId"/> @@ -984,7 +984,7 @@ under the License. <entity entity-name="ElectronicText" package-name="org.apache.ofbiz.content.data" title="Electronic Text Entity"> - <field name="dataResourceId" type="id-ne"></field> + <field name="dataResourceId" type="id"></field> <field name="textData" type="very-long"></field> <prim-key field="dataResourceId"/> <relation type="one" fk-name="DATA_REC_TEXT" rel-entity-name="DataResource"> @@ -994,7 +994,7 @@ under the License. <entity entity-name="FileExtension" package-name="org.apache.ofbiz.content.data" title="File Extension Entity"> - <field name="fileExtensionId" type="id-long-ne"></field> + <field name="fileExtensionId" type="id-long"></field> <field name="mimeTypeId" type="id-vlong-ne"></field> <prim-key field="fileExtensionId"/> <relation type="one" fk-name="FILEEXT_MMTYP" rel-entity-name="MimeType"> @@ -1004,7 +1004,7 @@ under the License. <entity entity-name="ImageDataResource" package-name="org.apache.ofbiz.content.data" title="Image Data Object Entity"> - <field name="dataResourceId" type="id-ne"></field> + <field name="dataResourceId" type="id"></field> <field name="imageData" type="byte-array"></field> <prim-key field="dataResourceId"/> <relation type="one" fk-name="DATA_REC_IMAGE" rel-entity-name="DataResource"> @@ -1015,7 +1015,7 @@ under the License. package-name="org.apache.ofbiz.content.data" default-resource-name="ContentEntityLabels" title="Data Meta-Data Predicate Entity"> - <field name="metaDataPredicateId" type="id-ne"></field> + <field name="metaDataPredicateId" type="id"></field> <field name="description" type="description"></field> <prim-key field="metaDataPredicateId"/> </entity> @@ -1023,7 +1023,7 @@ under the License. package-name="org.apache.ofbiz.content.data" default-resource-name="ContentEntityLabels" title="Mime Type Entity"> - <field name="mimeTypeId" type="id-vlong-ne"></field> + <field name="mimeTypeId" type="id-vlong"></field> <field name="description" type="description"></field> <prim-key field="mimeTypeId"/> </entity> @@ -1031,7 +1031,7 @@ under the License. package-name="org.apache.ofbiz.content.data" default-resource-name="ContentEntityLabels" title="Mime Text Template Entity"> - <field name="mimeTypeId" type="id-vlong-ne"></field> + <field name="mimeTypeId" type="id-vlong"></field> <field name="templateLocation" type="long-varchar"></field> <prim-key field="mimeTypeId"/> <relation type="one" fk-name="MIMETYPE_TPL_MT" rel-entity-name="MimeType"> @@ -1041,7 +1041,7 @@ under the License. <entity entity-name="OtherDataResource" package-name="org.apache.ofbiz.content.data" title="Other Data Object Entity"> - <field name="dataResourceId" type="id-ne"></field> + <field name="dataResourceId" type="id"></field> <field name="dataResourceContent" type="byte-array"></field> <prim-key field="dataResourceId"/> <relation type="one" fk-name="DATA_REC_OTHER" rel-entity-name="DataResource"> @@ -1051,7 +1051,7 @@ under the License. <entity entity-name="VideoDataResource" package-name="org.apache.ofbiz.content.data" title="Video Data Object Entity"> - <field name="dataResourceId" type="id-ne"></field> + <field name="dataResourceId" type="id"></field> <field name="videoData" type="byte-array"></field> <prim-key field="dataResourceId"/> <relation type="one" fk-name="DATA_REC_VIDEO" rel-entity-name="DataResource"> @@ -1066,7 +1066,7 @@ under the License. <entity entity-name="Document" package-name="org.apache.ofbiz.content.document" title="Document Entity"> - <field name="documentId" type="id-ne"></field> + <field name="documentId" type="id"></field> <field name="documentTypeId" type="id"></field> <field name="dateCreated" type="date-time"></field> <field name="comments" type="comment"></field> @@ -1084,8 +1084,8 @@ under the License. <entity entity-name="DocumentAttribute" package-name="org.apache.ofbiz.content.document" title="Document Attribute Entity"> - <field name="documentId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="documentId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="attrValue" type="value"></field> <field name="attrDescription" type="description"></field> <prim-key field="documentId"/> @@ -1101,8 +1101,8 @@ under the License. package-name="org.apache.ofbiz.content.document" default-resource-name="ContentEntityLabels" title="Document Type Entity"> - <field name="documentTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="documentTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="documentTypeId"/> @@ -1113,8 +1113,8 @@ under the License. <entity entity-name="DocumentTypeAttr" package-name="org.apache.ofbiz.content.document" title="Document Type Attribute Entity"> - <field name="documentTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="documentTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="documentTypeId"/> <prim-key field="attrName"/> @@ -1136,17 +1136,17 @@ under the License. <entity entity-name="WebPreferenceType" package-name="org.apache.ofbiz.content.preference" title="Web Preference Type Entity"> - <field name="webPreferenceTypeId" type="id-ne"></field> + <field name="webPreferenceTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="webPreferenceTypeId"/> </entity> <entity entity-name="WebUserPreference" package-name="org.apache.ofbiz.content.preference" title="Web User Preference Entity"> - <field name="userLoginId" type="id-vlong-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="visitId" type="id-ne"><description>To be able to keep preferences for a non loggin in user for the current session</description></field> - <field name="webPreferenceTypeId" type="id-ne"></field> + <field name="userLoginId" type="id-vlong"></field> + <field name="partyId" type="id"></field> + <field name="visitId" type="id"><description>To be able to keep preferences for a non loggin in user for the current session</description></field> + <field name="webPreferenceTypeId" type="id"></field> <field name="webPreferenceValue" type="long-varchar"/> <prim-key field="userLoginId"/> <prim-key field="partyId"/> @@ -1170,7 +1170,7 @@ under the License. <entity entity-name="Survey" package-name="org.apache.ofbiz.content.survey" title="Survey Entity"> - <field name="surveyId" type="id-ne"/> + <field name="surveyId" type="id"/> <field name="surveyName" type="name"/> <field name="description" type="description"/> <field name="comments" type="comment"/> @@ -1186,15 +1186,15 @@ under the License. package-name="org.apache.ofbiz.content.survey" default-resource-name="ContentEntityLabels" title="Survey Application Type Entity"> - <field name="surveyApplTypeId" type="id-ne"/> + <field name="surveyApplTypeId" type="id"/> <field name="description" type="description"/> <prim-key field="surveyApplTypeId"/> </entity> <entity entity-name="SurveyMultiResp" package-name="org.apache.ofbiz.content.survey" title="Survey Multi-Response Group Entity"> - <field name="surveyId" type="id-ne"/> - <field name="surveyMultiRespId" type="id-ne"/> + <field name="surveyId" type="id"/> + <field name="surveyMultiRespId" type="id"/> <field name="multiRespTitle" type="name"/> <prim-key field="surveyId"/> <prim-key field="surveyMultiRespId"/> @@ -1205,9 +1205,9 @@ under the License. <entity entity-name="SurveyMultiRespColumn" package-name="org.apache.ofbiz.content.survey" title="Survey Multi-Response Group Column/Category Entity"> - <field name="surveyId" type="id-ne"/> - <field name="surveyMultiRespId" type="id-ne"/> - <field name="surveyMultiRespColId" type="id-ne"/> + <field name="surveyId" type="id"/> + <field name="surveyMultiRespId" type="id"/> + <field name="surveyMultiRespColId" type="id"/> <field name="columnTitle" type="name"/> <field name="sequenceNum" type="numeric"/> <prim-key field="surveyId"/> @@ -1221,8 +1221,8 @@ under the License. <entity entity-name="SurveyPage" package-name="org.apache.ofbiz.content.survey" title="Survey Page Type Entity"> - <field name="surveyId" type="id-ne"/> - <field name="surveyPageSeqId" type="id-ne"/> + <field name="surveyId" type="id"/> + <field name="surveyPageSeqId" type="id"/> <field name="pageName" type="name"/> <field name="sequenceNum" type="numeric"/> <prim-key field="surveyId"/> @@ -1234,7 +1234,7 @@ under the License. <entity entity-name="SurveyQuestion" package-name="org.apache.ofbiz.content.survey" title="Survey Question Entity"> - <field name="surveyQuestionId" type="id-ne"/> + <field name="surveyQuestionId" type="id"/> <field name="surveyQuestionCategoryId" type="id-ne"/> <field name="surveyQuestionTypeId" type="id-ne"/> <field name="description" type="description"/> @@ -1303,8 +1303,8 @@ under the License. <entity entity-name="SurveyQuestionAppl" package-name="org.apache.ofbiz.content.survey" title="Survey Question Application Entity"> - <field name="surveyId" type="id-ne"/> - <field name="surveyQuestionId" type="id-ne"/> + <field name="surveyId" type="id"/> + <field name="surveyQuestionId" type="id"/> <field name="fromDate" type="date-time"/> <field name="thruDate" type="date-time"/> <field name="surveyPageSeqId" type="id-ne"/> @@ -1347,7 +1347,7 @@ under the License. <entity entity-name="SurveyQuestionCategory" package-name="org.apache.ofbiz.content.survey" title="Survey Question Category Entity"> - <field name="surveyQuestionCategoryId" type="id-ne"/> + <field name="surveyQuestionCategoryId" type="id"/> <field name="parentCategoryId" type="id"/> <field name="description" type="description"/> <prim-key field="surveyQuestionCategoryId"/> @@ -1358,8 +1358,8 @@ under the License. <entity entity-name="SurveyQuestionOption" package-name="org.apache.ofbiz.content.survey" title="Survey Question Option Entity"> - <field name="surveyQuestionId" type="id-ne"/> - <field name="surveyOptionSeqId" type="id-ne"/> + <field name="surveyQuestionId" type="id"/> + <field name="surveyOptionSeqId" type="id"/> <field name="description" type="description"/> <field name="sequenceNum" type="numeric"/> <field name="amountBase" type="currency-amount"/> @@ -1377,14 +1377,14 @@ under the License. package-name="org.apache.ofbiz.content.survey" default-resource-name="ContentEntityLabels" title="Survey Question Type Entity"> - <field name="surveyQuestionTypeId" type="id-ne"/> + <field name="surveyQuestionTypeId" type="id"/> <field name="description" type="description"/> <prim-key field="surveyQuestionTypeId"/> </entity> <entity entity-name="SurveyResponse" package-name="org.apache.ofbiz.content.survey" title="Survey Response Entity"> - <field name="surveyResponseId" type="id-ne"></field> + <field name="surveyResponseId" type="id"></field> <field name="surveyId" type="id-ne"></field> <field name="partyId" type="id"></field> <field name="responseDate" type="date-time"></field> @@ -1447,9 +1447,9 @@ under the License. <entity entity-name="SurveyResponseAnswer" package-name="org.apache.ofbiz.content.survey" title="Survey Response Answer Entity"> - <field name="surveyResponseId" type="id-ne"></field> - <field name="surveyQuestionId" type="id-ne"></field> - <field name="surveyMultiRespColId" type="id-ne"><description>This is needed to support multiple responses for different MultiResp Columns; if not part of a MultiResp will be _NA_</description></field> + <field name="surveyResponseId" type="id"></field> + <field name="surveyQuestionId" type="id"></field> + <field name="surveyMultiRespColId" type="id"><description>This is needed to support multiple responses for different MultiResp Columns; if not part of a MultiResp will be _NA_</description></field> <field name="surveyMultiRespId" type="id-ne"><description>This is not part of the primary key, but should be populated so that the SurveyMultiRespColumn can be more easily looked up.</description></field> <field name="booleanResponse" type="indicator"></field> <field name="currencyResponse" type="currency-amount"></field> @@ -1485,8 +1485,8 @@ under the License. <entity entity-name="SurveyTrigger" package-name="org.apache.ofbiz.content.survey" title="Survey Trigger Entity"> - <field name="surveyId" type="id-ne"/> - <field name="surveyApplTypeId" type="id-ne"/> + <field name="surveyId" type="id"/> + <field name="surveyApplTypeId" type="id"/> <field name="fromDate" type="date-time"/> <field name="thruDate" type="date-time"/> <prim-key field="surveyId"/> @@ -1513,9 +1513,9 @@ under the License. <entity entity-name="WebSiteContent" package-name="org.apache.ofbiz.content.website" title="Web Site Content Associations"> - <field name="webSiteId" type="id-ne"></field> - <field name="contentId" type="id-ne"></field> - <field name="webSiteContentTypeId" type="id-ne"></field> + <field name="webSiteId" type="id"></field> + <field name="contentId" type="id"></field> + <field name="webSiteContentTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="webSiteId"/> @@ -1549,9 +1549,9 @@ under the License. package-name="org.apache.ofbiz.content.website" default-resource-name="ContentEntityLabels" title="Web Site Content Type"> - <field name="webSiteContentTypeId" type="id-ne"></field> + <field name="webSiteContentTypeId" type="id"></field> <field name="description" type="description"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <prim-key field="webSiteContentTypeId"/> <relation type="one" fk-name="WSCT_TYPE_PARENT" title="Parent" rel-entity-name="WebSiteContentType"> @@ -1561,7 +1561,7 @@ under the License. <entity entity-name="WebSitePathAlias" package-name="org.apache.ofbiz.content.website" title="Web Site Path Alias"> - <field name="webSiteId" type="id-ne"></field> + <field name="webSiteId" type="id"></field> <field name="pathAlias" type="id-vlong"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -1581,7 +1581,7 @@ under the License. <entity entity-name="WebSitePublishPoint" package-name="org.apache.ofbiz.content.website" title="Web Site Publish Point"> - <field name="contentId" type="id-ne"></field> + <field name="contentId" type="id"></field> <field name="templateTitle" type="long-varchar"></field> <field name="styleSheetFile" type="long-varchar"></field> <field name="logo" type="long-varchar"></field> @@ -1597,9 +1597,9 @@ under the License. </relation> </entity> <entity entity-name="WebSiteRole" package-name="org.apache.ofbiz.party.party" title="WebSite Role Association Entity"> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> - <field name="webSiteId" type="id-ne"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> + <field name="webSiteId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="sequenceNum" type="numeric"></field> @@ -1655,7 +1655,7 @@ under the License. </extend-entity> <entity entity-name="ContentKeyword" package-name="org.apache.ofbiz.content.content" title="Content Keyword Entity" never-cache="true"> - <field name="contentId" type="id-ne"></field> + <field name="contentId" type="id"></field> <field name="keyword" type="short-varchar"></field> <field name="relevancyWeight" type="numeric"></field> <prim-key field="contentId"/> @@ -1668,8 +1668,8 @@ under the License. </index> </entity> <entity entity-name="ContentSearchConstraint" package-name="org.apache.ofbiz.content.content" never-cache="true" title="Content Search Result Constraint Entity"> - <field name="contentSearchResultId" type="id-ne"></field> - <field name="constraintSeqId" type="id-ne"></field> + <field name="contentSearchResultId" type="id"></field> + <field name="constraintSeqId" type="id"></field> <field name="constraintName" type="long-varchar"></field> <field name="infoString" type="long-varchar"></field> <field name="includeSubCategories" type="indicator"></field> @@ -1689,7 +1689,7 @@ under the License. package-name="org.apache.ofbiz.content.content" never-cache="true" title="Content Search Result Entity"> - <field name="contentSearchResultId" type="id-ne"></field> + <field name="contentSearchResultId" type="id"></field> <field name="visitId" type="id"></field> <field name="orderByName" type="long-varchar"></field> <field name="isAscending" type="indicator"></field> @@ -1702,8 +1702,8 @@ under the License. <entity entity-name="WebAnalyticsConfig" package-name="org.apache.ofbiz.content.website" title="Web Analytics Configuration"> - <field name="webSiteId" type="id-ne"></field> - <field name="webAnalyticsTypeId" type="id-ne"></field> + <field name="webSiteId" type="id"></field> + <field name="webAnalyticsTypeId" type="id"></field> <field name="webAnalyticsCode" type="very-long"><description>copy in here the analitics javascript code without the beginning- and end<script> tags</description></field> <prim-key field="webSiteId"/> <prim-key field="webAnalyticsTypeId"/> @@ -1717,7 +1717,7 @@ under the License. <entity entity-name="WebAnalyticsType" package-name="org.apache.ofbiz.content.website" title="Web Analytics Type Entity"> - <field name="webAnalyticsTypeId" type="id-ne"></field> + <field name="webAnalyticsTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml?rev=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml Sat May 27 11:28:36 2017 @@ -43,8 +43,8 @@ under the License. <entity entity-name="PartyQual" package-name="org.apache.ofbiz.humanres.ability" title="Party Qualification Entity"> - <field name="partyId" type="id-ne"></field> - <field name="partyQualTypeId" type="id-ne"></field> + <field name="partyId" type="id"></field> + <field name="partyQualTypeId" type="id"></field> <field name="qualificationDesc" type="id-long"></field> <field name="title" type="id-long"><description>Title of degree or job</description></field> <field name="statusId" type="id"><description>Status e.g. completed, part-time etc.</description></field> @@ -71,8 +71,8 @@ under the License. <entity entity-name="PartyQualType" package-name="org.apache.ofbiz.humanres.ability" title="Party Qualification Type Entity"> - <field name="partyQualTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="partyQualTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="partyQualTypeId"/> @@ -83,7 +83,7 @@ under the License. <entity entity-name="PartyResume" package-name="org.apache.ofbiz.humanres.ability" title="Resume Entity"> - <field name="resumeId" type="id-ne"></field> + <field name="resumeId" type="id"></field> <field name="partyId" type="id-ne"></field> <field name="contentId" type="id"></field> <field name="resumeDate" type="date-time"></field> @@ -99,8 +99,8 @@ under the License. <entity entity-name="PartySkill" package-name="org.apache.ofbiz.humanres.ability" title="Party Skill Entity"> - <field name="partyId" type="id-ne"></field> - <field name="skillTypeId" type="id-ne"></field> + <field name="partyId" type="id"></field> + <field name="skillTypeId" type="id"></field> <field name="yearsExperience" type="numeric"></field> <field name="rating" type="numeric"></field> <field name="skillLevel" type="numeric"></field> @@ -117,8 +117,8 @@ under the License. <entity entity-name="PerfRatingType" package-name="org.apache.ofbiz.humanres.ability" title="Performance Rating Type Entity"> - <field name="perfRatingTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="perfRatingTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="perfRatingTypeId"/> @@ -129,9 +129,9 @@ under the License. <entity entity-name="PerfReview" package-name="org.apache.ofbiz.humanres.ability" title="Employee Performance Review Entity"> - <field name="employeePartyId" type="id-ne"></field> - <field name="employeeRoleTypeId" type="id-ne"></field> - <field name="perfReviewId" type="id-ne"></field> + <field name="employeePartyId" type="id"></field> + <field name="employeeRoleTypeId" type="id"></field> + <field name="perfReviewId" type="id"></field> <field name="managerPartyId" type="id"></field> <field name="managerRoleTypeId" type="id"></field> <field name="paymentId" type="id"></field> @@ -166,10 +166,10 @@ under the License. <entity entity-name="PerfReviewItem" package-name="org.apache.ofbiz.humanres.ability" title="Performance Review Item Entity"> - <field name="employeePartyId" type="id-ne"></field> + <field name="employeePartyId" type="id"></field> <field name="employeeRoleTypeId" type="id"></field> - <field name="perfReviewId" type="id-ne"></field> - <field name="perfReviewItemSeqId" type="id-ne"></field> + <field name="perfReviewId" type="id"></field> + <field name="perfReviewItemSeqId" type="id"></field> <field name="perfReviewItemTypeId" type="id"></field> <field name="perfRatingTypeId" type="id"></field> <field name="comments" type="comment"></field> @@ -199,8 +199,8 @@ under the License. <entity entity-name="PerfReviewItemType" package-name="org.apache.ofbiz.humanres.ability" title="Performance Review Item Type Entity"> - <field name="perfReviewItemTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="perfReviewItemTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="perfReviewItemTypeId"/> @@ -211,8 +211,8 @@ under the License. <entity entity-name="PerformanceNote" package-name="org.apache.ofbiz.humanres.ability" title="Performance Note Entity"> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="communicationDate" type="date-time"></field> @@ -231,9 +231,9 @@ under the License. <entity entity-name="PersonTraining" package-name="org.apache.ofbiz.humanres.ability" title="Person Training Entity"> - <field name="partyId" type="id-ne"></field> + <field name="partyId" type="id"></field> <field name="trainingRequestId" type="id-ne"></field> - <field name="trainingClassTypeId" type="id-ne"></field> + <field name="trainingClassTypeId" type="id"></field> <field name="workEffortId" type="id-ne"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -262,7 +262,7 @@ under the License. <entity entity-name="ResponsibilityType" package-name="org.apache.ofbiz.humanres.ability" title="Responsibility Type Entity"> - <field name="responsibilityTypeId" type="id-ne"></field> + <field name="responsibilityTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> @@ -274,8 +274,8 @@ under the License. <entity entity-name="SkillType" package-name="org.apache.ofbiz.humanres.ability" title="Skill Type Entity"> - <field name="skillTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="skillTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="skillTypeId"/> @@ -286,7 +286,7 @@ under the License. <entity entity-name="TrainingClassType" package-name="org.apache.ofbiz.humanres.ability" title="Training Class Type Entity"> - <field name="trainingClassTypeId" type="id-ne"></field> + <field name="trainingClassTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> @@ -303,9 +303,9 @@ under the License. <entity entity-name="BenefitType" package-name="org.apache.ofbiz.humanres.employment" title="Benefit Type Entity"> - <field name="benefitTypeId" type="id-ne"></field> + <field name="benefitTypeId" type="id"></field> <field name="benefitName" type="name"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <field name="employerPaidPercentage" type="floating-point"></field> @@ -330,10 +330,10 @@ under the License. <entity entity-name="Employment" package-name="org.apache.ofbiz.humanres.employment" title="Employment Entity"> - <field name="roleTypeIdFrom" type="id-ne"></field> - <field name="roleTypeIdTo" type="id-ne"></field> - <field name="partyIdFrom" type="id-ne"></field> - <field name="partyIdTo" type="id-ne"></field> + <field name="roleTypeIdFrom" type="id"></field> + <field name="roleTypeIdTo" type="id"></field> + <field name="partyIdFrom" type="id"></field> + <field name="partyIdTo" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="terminationReasonId" type="id"></field> @@ -383,7 +383,7 @@ under the License. <entity entity-name="EmploymentApp" package-name="org.apache.ofbiz.humanres.employment" title="Employment Application Entity"> - <field name="applicationId" type="id-ne"></field> + <field name="applicationId" type="id"></field> <field name="emplPositionId" type="id"></field> <field name="statusId" type="id"></field> <field name="employmentAppSourceTypeId" type="id"></field> @@ -418,8 +418,8 @@ under the License. <entity entity-name="EmploymentAppSourceType" package-name="org.apache.ofbiz.humanres.employment" title="Employment Application Source Type Entity"> - <field name="employmentAppSourceTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="employmentAppSourceTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="employmentAppSourceTypeId"/> @@ -430,8 +430,8 @@ under the License. <entity entity-name="EmplLeave" package-name="org.apache.ofbiz.humanres.employment" title="Employee Leave Entity"> - <field name="partyId" type="id-ne"/> - <field name="leaveTypeId" type="id-ne"/> + <field name="partyId" type="id"/> + <field name="leaveTypeId" type="id"/> <field name="emplLeaveReasonTypeId" type="id-ne"/> <field name="fromDate" type="date-time"/> <field name="thruDate" type="date-time"/> @@ -461,8 +461,8 @@ under the License. package-name="org.apache.ofbiz.humanres.employment" default-resource-name="HumanResEntityLabels" title="Employee Leave Type Entity"> - <field name="leaveTypeId" type="id-ne"/> - <field name="parentTypeId" type="id-ne"/> + <field name="leaveTypeId" type="id"/> + <field name="parentTypeId" type="id"/> <field name="hasTable" type="indicator"/> <field name="description" type="description"/> <prim-key field="leaveTypeId"/> @@ -473,11 +473,11 @@ under the License. <entity entity-name="PartyBenefit" package-name="org.apache.ofbiz.humanres.employment" title="Party Benefit Entity"> - <field name="roleTypeIdFrom" type="id-ne"></field> - <field name="roleTypeIdTo" type="id-ne"></field> - <field name="partyIdFrom" type="id-ne"></field> - <field name="partyIdTo" type="id-ne"></field> - <field name="benefitTypeId" type="id-ne"></field> + <field name="roleTypeIdFrom" type="id"></field> + <field name="roleTypeIdTo" type="id"></field> + <field name="partyIdFrom" type="id"></field> + <field name="partyIdTo" type="id"></field> + <field name="benefitTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="periodTypeId" type="id"></field> @@ -514,7 +514,7 @@ under the License. <entity entity-name="PayGrade" package-name="org.apache.ofbiz.humanres.employment" title="Pay Grade Entity"> - <field name="payGradeId" type="id-ne"></field> + <field name="payGradeId" type="id"></field> <field name="payGradeName" type="name"></field> <field name="comments" type="comment"></field> <prim-key field="payGradeId"/> @@ -522,10 +522,10 @@ under the License. <entity entity-name="PayHistory" package-name="org.apache.ofbiz.humanres.employment" title="Pay History Entity"> - <field name="roleTypeIdFrom" type="id-ne"></field> - <field name="roleTypeIdTo" type="id-ne"></field> - <field name="partyIdFrom" type="id-ne"></field> - <field name="partyIdTo" type="id-ne"></field> + <field name="roleTypeIdFrom" type="id"></field> + <field name="roleTypeIdTo" type="id"></field> + <field name="partyIdFrom" type="id"></field> + <field name="partyIdTo" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="salaryStepSeqId" type="id"></field> @@ -560,9 +560,9 @@ under the License. <entity entity-name="PayrollPreference" package-name="org.apache.ofbiz.humanres.employment" title="Payroll Preference Entity"> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> - <field name="payrollPreferenceSeqId" type="id-ne"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> + <field name="payrollPreferenceSeqId" type="id"></field> <field name="deductionTypeId" type="id-ne"></field> <field name="paymentMethodTypeId" type="id"></field> <field name="periodTypeId" type="id"></field> @@ -596,8 +596,8 @@ under the License. <entity entity-name="SalaryStep" table-name="SALARY_STEP_NEW" package-name="org.apache.ofbiz.humanres.employment" title="Salary Step Entity"> - <field name="salaryStepSeqId" type="id-ne"></field> - <field name="payGradeId" type="id-ne"></field> + <field name="salaryStepSeqId" type="id"></field> + <field name="payGradeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="dateModified" type="date-time"></field> @@ -614,15 +614,15 @@ under the License. <entity entity-name="TerminationReason" package-name="org.apache.ofbiz.humanres.employment" title="Termination Reason Entity"> - <field name="terminationReasonId" type="id-ne"></field> + <field name="terminationReasonId" type="id"></field> <field name="description" type="description"></field> <prim-key field="terminationReasonId"/> </entity> <entity entity-name="TerminationType" package-name="org.apache.ofbiz.humanres.employment" title="Termination Type Entity"> - <field name="terminationTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="terminationTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="terminationTypeId"/> @@ -633,7 +633,7 @@ under the License. <entity entity-name="UnemploymentClaim" package-name="org.apache.ofbiz.humanres.employment" title="Unemployment Claim Entity"> - <field name="unemploymentClaimId" type="id-ne"></field> + <field name="unemploymentClaimId" type="id"></field> <field name="unemploymentClaimDate" type="date-time"></field> <field name="description" type="description"></field> <field name="statusId" type="id"></field> @@ -663,7 +663,7 @@ under the License. <entity entity-name="EmplPosition" package-name="org.apache.ofbiz.humanres.position" title="EmplPosition Entity"> - <field name="emplPositionId" type="id-ne"></field> + <field name="emplPositionId" type="id"></field> <field name="statusId" type="id"></field> <field name="partyId" type="id"></field> <field name="budgetId" type="id"></field> @@ -695,8 +695,8 @@ under the License. <entity entity-name="EmplPositionClassType" package-name="org.apache.ofbiz.humanres.position" title="EmplPosition Classification Type Entity"> - <field name="emplPositionClassTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="emplPositionClassTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="emplPositionClassTypeId"/> @@ -707,8 +707,8 @@ under the License. <entity entity-name="EmplPositionFulfillment" package-name="org.apache.ofbiz.humanres.position" title="EmplPosition Fulfillment Entity"> - <field name="emplPositionId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> + <field name="emplPositionId" type="id"></field> + <field name="partyId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="comments" type="comment"></field> @@ -741,8 +741,8 @@ under the License. <entity entity-name="EmplPositionReportingStruct" package-name="org.apache.ofbiz.humanres.position" title="EmplPosition Reporting Structure Entity"> - <field name="emplPositionIdReportingTo" type="id-ne"></field> - <field name="emplPositionIdManagedBy" type="id-ne"></field> + <field name="emplPositionIdReportingTo" type="id"></field> + <field name="emplPositionIdManagedBy" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="comments" type="comment"></field> @@ -760,8 +760,8 @@ under the License. <entity entity-name="EmplPositionResponsibility" package-name="org.apache.ofbiz.humanres.position" title="EmplPosition Responsibility Entity"> - <field name="emplPositionId" type="id-ne"></field> - <field name="responsibilityTypeId" type="id-ne"></field> + <field name="emplPositionId" type="id"></field> + <field name="responsibilityTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="comments" type="comment"></field> @@ -778,8 +778,8 @@ under the License. <entity entity-name="EmplPositionType" package-name="org.apache.ofbiz.humanres.position" title="EmplPosition Type Entity"> - <field name="emplPositionTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="emplPositionTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="emplPositionTypeId"/> @@ -790,8 +790,8 @@ under the License. <entity entity-name="EmplPositionTypeClass" package-name="org.apache.ofbiz.humanres.position" title="EmplPosition Type Class Entity"> - <field name="emplPositionTypeId" type="id-ne"></field> - <field name="emplPositionClassTypeId" type="id-ne"></field> + <field name="emplPositionTypeId" type="id"></field> + <field name="emplPositionClassTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="standardHoursPerWeek" type="floating-point"></field> @@ -808,8 +808,8 @@ under the License. <entity entity-name="ValidResponsibility" package-name="org.apache.ofbiz.humanres.position" title="Valid Responsibility Entity"> - <field name="emplPositionTypeId" type="id-ne"></field> - <field name="responsibilityTypeId" type="id-ne"></field> + <field name="emplPositionTypeId" type="id"></field> + <field name="responsibilityTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="comments" type="comment"></field> @@ -826,8 +826,8 @@ under the License. <entity entity-name="EmplPositionTypeRate" table-name="EMPL_POSITION_TYPE_RATE_NEW" package-name="org.apache.ofbiz.humanres.position" title="EmplPosition Type Rate Entity"> - <field name="emplPositionTypeId" type="id-ne"/> - <field name="rateTypeId" type="id-ne"/> + <field name="emplPositionTypeId" type="id"/> + <field name="rateTypeId" type="id"/> <field name="payGradeId" type="id"/> <field name="salaryStepSeqId" type="id"/> <field name="fromDate" type="date-time"/> @@ -870,7 +870,7 @@ under the License. <entity entity-name="JobRequisition" package-name="org.apache.ofbiz.humanres.recruitment" title="Entity for storing data about recruitment"> - <field name="jobRequisitionId" type="id-ne"></field> + <field name="jobRequisitionId" type="id"></field> <field name="durationMonths" type="numeric"></field> <field name="age" type="numeric"></field> <field name="gender" type="indicator"></field> @@ -898,7 +898,7 @@ under the License. <entity entity-name="JobInterview" package-name="org.apache.ofbiz.humanres.recruitment" title="Entity for storing data about Interviews conducted"> - <field name="jobInterviewId" type="id-ne"></field> + <field name="jobInterviewId" type="id"></field> <field name="jobIntervieweePartyId" type="id"></field> <field name="jobRequisitionId" type="id"></field> <field name="jobInterviewerPartyId" type="id"></field> @@ -926,7 +926,7 @@ under the License. <entity entity-name="JobInterviewType" package-name="org.apache.ofbiz.humanres.recruitment" title="Entity for storing data about Interview Types"> - <field name="jobInterviewTypeId" type="id-ne"></field> + <field name="jobInterviewTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="jobInterviewTypeId"/> </entity> @@ -951,15 +951,15 @@ under the License. <entity entity-name="TrainingRequest" package-name="org.apache.ofbiz.humanres.trainings" title="Training Request Entity"> - <field name="trainingRequestId" type="id-ne"></field> + <field name="trainingRequestId" type="id"></field> <prim-key field="trainingRequestId"/> </entity> <entity entity-name="EmplLeaveReasonType" package-name="org.apache.ofbiz.humanres.employment" default-resource-name="HumanResEntityLabels" title="Leave Reason Type Entity"> - <field name="emplLeaveReasonTypeId" type="id-ne"/> - <field name="parentTypeId" type="id-ne"/> + <field name="emplLeaveReasonTypeId" type="id"/> + <field name="parentTypeId" type="id"/> <field name="hasTable" type="indicator"/> <field name="description" type="description"/> <prim-key field="emplLeaveReasonTypeId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml?rev=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml Sat May 27 11:28:36 2017 @@ -43,7 +43,7 @@ under the License. <entity entity-name="ProductManufacturingRule" package-name="org.apache.ofbiz.manufacturing.bom" title="Product To Part Rule Entity"> - <field name="ruleId" type="id-ne"></field> + <field name="ruleId" type="id"></field> <field name="productId" type="id"></field> <field name="productIdFor" type="id"></field> <field name="productIdIn" type="id-ne"></field> @@ -84,7 +84,7 @@ under the License. <description>Used to defined the availability of the machines, this entity define the Id and the week definition. The Id is used in the exception calendar table as reference </description> - <field name="calendarId" type="id-ne"></field> + <field name="calendarId" type="id"></field> <field name="description" type="description"></field> <field name="calendarWeekId" type="id-ne"></field> <prim-key field="calendarId"/> @@ -97,7 +97,7 @@ under the License. title="Calendar Exception Day entity"> <description>Used to defined some days which differ from the normal day definition in the weekId associated in the calendar. </description> - <field name="calendarId" type="id-ne"></field> + <field name="calendarId" type="id"></field> <field name="exceptionDateStartTime" type="date-time"></field> <field name="exceptionCapacity" type="fixed-point"></field> <field name="usedCapacity" type="fixed-point"></field> @@ -112,7 +112,7 @@ under the License. package-name="org.apache.ofbiz.manufacturing.techdata" title="Calendar Exception Week entity"> <description>Used to defined some weeks which differ from the normal week defined in the calendar.</description> - <field name="calendarId" type="id-ne"></field> + <field name="calendarId" type="id"></field> <field name="exceptionDateStart" type="date"></field> <field name="calendarWeekId" type="id-ne"></field> <field name="description" type="description"></field> @@ -130,7 +130,7 @@ under the License. default-resource-name="ManufacturingEntityLabels" title="Week definition entity"> <description>Used to defined the week definition disponibility for machine</description> - <field name="calendarWeekId" type="id-ne"></field> + <field name="calendarWeekId" type="id"></field> <field name="description" type="description"></field> <field name="mondayStartTime" type="time"></field> <field name="mondayCapacity" type="floating-point"></field> @@ -158,7 +158,7 @@ under the License. default-resource-name="ManufacturingEntityLabels" title="MRP Event Type"> <description></description> - <field name="mrpEventTypeId" type="id-ne"></field> + <field name="mrpEventTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="mrpEventTypeId"/> </entity> @@ -167,10 +167,10 @@ under the License. package-name="org.apache.ofbiz.manufacturing.mrp" title="MRP Event"> <description></description> - <field name="mrpId" type="id-ne"></field> - <field name="productId" type="id-ne"></field> + <field name="mrpId" type="id"></field> + <field name="productId" type="id"></field> <field name="eventDate" type="date-time"></field> - <field name="mrpEventTypeId" type="id-ne"></field> + <field name="mrpEventTypeId" type="id"></field> <field name="facilityId" type="id"></field> <field name="quantity" type="floating-point"></field> <field name="eventName" type="very-long"></field> 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=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml Sat May 27 11:28:36 2017 @@ -45,7 +45,7 @@ under the License. <entity entity-name="MarketingCampaign" package-name="org.apache.ofbiz.marketing.campaign" title="Marketing Campaign Entity"> - <field name="marketingCampaignId" type="id-ne"></field> + <field name="marketingCampaignId" type="id"></field> <field name="parentCampaignId" type="id"></field> <field name="statusId" type="id"></field> <field name="campaignName" type="name"></field> @@ -78,8 +78,8 @@ under the License. <entity entity-name="MarketingCampaignNote" package-name="org.apache.ofbiz.marketing.campaign" title="Marketing Campaign Note Entity"> - <field name="marketingCampaignId" type="id-ne"></field> - <field name="noteId" type="id-ne"></field> + <field name="marketingCampaignId" type="id"></field> + <field name="noteId" type="id"></field> <prim-key field="marketingCampaignId"/> <prim-key field="noteId"/> <relation type="one" fk-name="MKTGCPN_NOTE_CMPN" rel-entity-name="MarketingCampaign"> @@ -92,8 +92,8 @@ under the License. <entity entity-name="MarketingCampaignPrice" package-name="org.apache.ofbiz.marketing.campaign" title="Marketing Campaign Price Entity"> - <field name="marketingCampaignId" type="id-ne"></field> - <field name="productPriceRuleId" type="id-ne"></field> + <field name="marketingCampaignId" type="id"></field> + <field name="productPriceRuleId" type="id"></field> <prim-key field="marketingCampaignId"/> <prim-key field="productPriceRuleId"/> <relation type="one" fk-name="MKTGCPN_PRICE_MC" rel-entity-name="MarketingCampaign"> @@ -106,8 +106,8 @@ under the License. <entity entity-name="MarketingCampaignPromo" package-name="org.apache.ofbiz.marketing.campaign" title="Marketing Campaign Promo Entity"> - <field name="marketingCampaignId" type="id-ne"></field> - <field name="productPromoId" type="id-ne"></field> + <field name="marketingCampaignId" type="id"></field> + <field name="productPromoId" type="id"></field> <prim-key field="marketingCampaignId"/> <prim-key field="productPromoId"/> <relation type="one" fk-name="MKTGCPN_PROMO_MC" rel-entity-name="MarketingCampaign"> @@ -120,9 +120,9 @@ under the License. <entity entity-name="MarketingCampaignRole" package-name="org.apache.ofbiz.marketing.campaign" title="Marketing Campaign Role Entity"> - <field name="marketingCampaignId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="marketingCampaignId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <prim-key field="marketingCampaignId"/> <prim-key field="partyId"/> <prim-key field="roleTypeId"/> @@ -148,7 +148,7 @@ under the License. <entity entity-name="ContactList" package-name="org.apache.ofbiz.marketing.contact" title="Contact List Entity"> - <field name="contactListId" type="id-ne"></field> + <field name="contactListId" type="id"></field> <field name="contactListTypeId" type="id-ne"></field> <field name="contactMechTypeId" type="id-ne"></field> <field name="marketingCampaignId" type="id"></field> @@ -188,8 +188,8 @@ under the License. <entity entity-name="WebSiteContactList" package-name="org.apache.ofbiz.marketing.contact" title="Web Site Contact List Entity"> - <field name="webSiteId" type="id-ne"></field> - <field name="contactListId" type="id-ne"></field> + <field name="webSiteId" type="id"></field> + <field name="contactListId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="webSiteId"/> @@ -205,9 +205,9 @@ under the License. <entity entity-name="ContactListCommStatus" package-name="org.apache.ofbiz.marketing.contact" title="Contact List Entity"> - <field name="contactListId" type="id-ne"></field> - <field name="communicationEventId" type="id-ne"></field> - <field name="contactMechId" type="id-ne"></field> + <field name="contactListId" type="id"></field> + <field name="communicationEventId" type="id"></field> + <field name="contactMechId" type="id"></field> <field name="partyId" type="id"></field> <field name="messageId" type="value"></field> <field name="statusId" type="id-ne"></field> @@ -240,8 +240,8 @@ under the License. <entity entity-name="ContactListParty" package-name="org.apache.ofbiz.marketing.contact" title="Contact List Party Entity"> - <field name="contactListId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> + <field name="contactListId" type="id"></field> + <field name="partyId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="statusId" type="id"></field> @@ -275,8 +275,8 @@ under the License. <entity entity-name="ContactListPartyStatus" package-name="org.apache.ofbiz.marketing.contact" title="Contact List Party Status Entity"> - <field name="contactListId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> + <field name="contactListId" type="id"></field> + <field name="partyId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="statusDate" type="date-time"></field> <field name="statusId" type="id"></field> @@ -296,7 +296,7 @@ under the License. package-name="org.apache.ofbiz.marketing.contact" default-resource-name="MarketingEntityLabels" title="Contact List Type Entity"> - <field name="contactListTypeId" type="id-ne"></field> + <field name="contactListTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="contactListTypeId"/> </entity> @@ -308,7 +308,7 @@ under the License. <entity entity-name="SegmentGroup" package-name="org.apache.ofbiz.marketing.segment" title="Segment Group Entity"> - <field name="segmentGroupId" type="id-ne"></field> + <field name="segmentGroupId" type="id"></field> <field name="segmentGroupTypeId" type="id-ne"></field> <field name="description" type="description"></field> <field name="productStoreId" type="id"></field> @@ -323,8 +323,8 @@ under the License. <entity entity-name="SegmentGroupClassification" package-name="org.apache.ofbiz.marketing.segment" title="Segment Group Classification Entity"> - <field name="segmentGroupId" type="id-ne"></field> - <field name="partyClassificationGroupId" type="id-ne"></field> + <field name="segmentGroupId" type="id"></field> + <field name="partyClassificationGroupId" type="id"></field> <prim-key field="segmentGroupId"/> <prim-key field="partyClassificationGroupId"/> <relation type="one" fk-name="SGMTGRPCLS_SGGP" rel-entity-name="SegmentGroup"> @@ -337,8 +337,8 @@ under the License. <entity entity-name="SegmentGroupGeo" package-name="org.apache.ofbiz.marketing.segment" title="Segment Group Geo Entity"> - <field name="segmentGroupId" type="id-ne"></field> - <field name="geoId" type="id-ne"></field> + <field name="segmentGroupId" type="id"></field> + <field name="geoId" type="id"></field> <prim-key field="segmentGroupId"/> <prim-key field="geoId"/> <relation type="one" fk-name="SGMTGRPGEO_SGGP" rel-entity-name="SegmentGroup"> @@ -351,9 +351,9 @@ under the License. <entity entity-name="SegmentGroupRole" package-name="org.apache.ofbiz.marketing.segment" title="Segment Group Role Entity"> - <field name="segmentGroupId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="segmentGroupId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <prim-key field="segmentGroupId"/> <prim-key field="partyId"/> <prim-key field="roleTypeId"/> @@ -375,7 +375,7 @@ under the License. package-name="org.apache.ofbiz.marketing.segment" default-resource-name="MarketingEntityLabels" title="Segment Group Type Entity"> - <field name="segmentGroupTypeId" type="id-ne"></field> + <field name="segmentGroupTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="segmentGroupTypeId"/> </entity> @@ -438,7 +438,7 @@ under the License. <entity entity-name="TrackingCode" package-name="org.apache.ofbiz.marketing.tracking" title="Tracking Code Entity"> - <field name="trackingCodeId" type="id-ne"></field> + <field name="trackingCodeId" type="id"></field> <field name="trackingCodeTypeId" type="id-ne"></field> <field name="marketingCampaignId" type="id"></field> <field name="redirectUrl" type="url"></field> @@ -468,8 +468,8 @@ under the License. <entity entity-name="TrackingCodeOrder" package-name="org.apache.ofbiz.marketing.tracking" title="Tracking Code Visit Entity"> - <field name="orderId" type="id-ne"></field> - <field name="trackingCodeTypeId" type="id-ne"></field> + <field name="orderId" type="id"></field> + <field name="trackingCodeTypeId" type="id"></field> <field name="trackingCodeId" type="id-ne"></field> <field name="isBillable" type="indicator"></field> <field name="siteId" type="long-varchar"></field> @@ -490,10 +490,10 @@ under the License. <entity entity-name="TrackingCodeOrderReturn" package-name="org.apache.ofbiz.marketing.tracking" title="Tracking Code And Order Return"> - <field name="returnId" type="id-ne"></field> - <field name="orderId" type="id-ne"></field> + <field name="returnId" type="id"></field> + <field name="orderId" type="id"></field> <field name="orderItemSeqId" type="id-ne"></field> - <field name="trackingCodeTypeId" type="id-ne"></field> + <field name="trackingCodeTypeId" type="id"></field> <field name="trackingCodeId" type="id-ne"></field> <field name="isBillable" type="indicator"></field> <field name="siteId" type="long-varchar"></field> @@ -519,15 +519,15 @@ under the License. package-name="org.apache.ofbiz.marketing.tracking" default-resource-name="MarketingEntityLabels" title="Tracking Code Type Entity"> - <field name="trackingCodeTypeId" type="id-ne"></field> + <field name="trackingCodeTypeId" type="id"></field> <field name="description" type="description"></field> <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-ne"></field> - <field name="visitId" type="id-ne"></field> + <field name="trackingCodeId" type="id"></field> + <field name="visitId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="sourceEnumId" type="id"></field> <prim-key field="trackingCodeId"/> @@ -652,7 +652,7 @@ under the License. <entity entity-name="SalesOpportunity" package-name="org.apache.ofbiz.marketing.opportunity" title="Main entity of information about sales opportunities"> - <field name="salesOpportunityId" type="id-ne"></field> + <field name="salesOpportunityId" type="id"></field> <field name="opportunityName" type="name"></field> <field name="description" type="very-long"/> <field name="nextStep" type="very-long"/> @@ -687,7 +687,7 @@ under the License. <entity entity-name="SalesOpportunityHistory" package-name="org.apache.ofbiz.marketing.opportunity" title="Tracks a history of sales opportunity information"> - <field name="salesOpportunityHistoryId" type="id-ne"></field> + <field name="salesOpportunityHistoryId" type="id"></field> <field name="salesOpportunityId" type="id-ne"></field> <field name="description" type="very-long"/> <field name="nextStep" type="very-long"/> @@ -719,9 +719,9 @@ under the License. <entity entity-name="SalesOpportunityRole" package-name="org.apache.ofbiz.marketing.opportunity" title="Describes roles of different parties involved in a sales opportunity"> - <field name="salesOpportunityId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"/> + <field name="salesOpportunityId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"/> <!-- it may be nice to add fromDate and thruDate at some point to track changing roles if that's ever important --> <prim-key field="salesOpportunityId"/> <prim-key field="partyId"/> @@ -755,7 +755,7 @@ under the License. <entity entity-name="SalesOpportunityStage" package-name="org.apache.ofbiz.marketing.opportunity" title="Describes stages of a sales opportunity with associated probability factors."> - <field name="opportunityStageId" type="id-ne"></field> + <field name="opportunityStageId" type="id"></field> <field name="description" type="description"/> <field name="defaultProbability" type="fixed-point"/> <field name="sequenceNum" type="numeric"/> @@ -765,8 +765,8 @@ under the License. <entity entity-name="SalesOpportunityWorkEffort" package-name="org.apache.ofbiz.marketing.opportunity" title="Relates sales opportunities to their work efforts."> - <field name="salesOpportunityId" type="id-ne"></field> - <field name="workEffortId" type="id-ne"></field> + <field name="salesOpportunityId" type="id"></field> + <field name="workEffortId" type="id"></field> <prim-key field="salesOpportunityId"/> <prim-key field="workEffortId"/> <relation type="one" fk-name="SOPPWEFF_SOPP" rel-entity-name="SalesOpportunity"> @@ -780,8 +780,8 @@ under the License. <entity entity-name="SalesOpportunityQuote" package-name="org.apache.ofbiz.marketing.opportunity" title="Relates sales opportunities to their quotes."> - <field name="salesOpportunityId" type="id-ne"></field> - <field name="quoteId" type="id-ne"></field> + <field name="salesOpportunityId" type="id"></field> + <field name="quoteId" type="id"></field> <prim-key field="salesOpportunityId"/> <prim-key field="quoteId"/> <relation type="one" fk-name="SOPPQTE_SOPP" rel-entity-name="SalesOpportunity"> @@ -795,7 +795,7 @@ under the License. <entity entity-name="SalesForecast" package-name="org.apache.ofbiz.marketing.opportunity" title="Stores sales forecast data for sales opportunities."> - <field name="salesForecastId" type="id-ne"></field> + <field name="salesForecastId" type="id"></field> <field name="parentSalesForecastId" type="id"></field> <field name="organizationPartyId" type="id"></field> <field name="internalPartyId" type="id"></field> @@ -837,8 +837,8 @@ under the License. <entity entity-name="SalesForecastDetail" package-name="org.apache.ofbiz.marketing.opportunity" title="Stores Details of Resourses of Sales Forecast for simulation of MRP"> - <field name="salesForecastId" type="id-ne"/> - <field name="salesForecastDetailId" type="id-ne"/> + <field name="salesForecastId" type="id"/> + <field name="salesForecastDetailId" type="id"/> <field name="amount" type="currency-amount"/> <field name="quantityUomId" type="id"/> <field name="quantity" type="fixed-point"/> @@ -863,7 +863,7 @@ under the License. <entity entity-name="SalesForecastHistory" package-name="org.apache.ofbiz.marketing.opportunity" title="Keeps a record of changes to a sales forecast."> - <field name="salesForecastHistoryId" type="id-ne"></field> + <field name="salesForecastHistoryId" type="id"></field> <field name="salesForecastId" type="id-ne"></field> <field name="parentSalesForecastId" type="id"></field> <field name="organizationPartyId" type="id"></field> @@ -904,8 +904,8 @@ under the License. <entity entity-name="SalesOpportunityCompetitor" package-name="org.apache.ofbiz.marketing.opportunity" title="Sales opportunity competitors record"> - <field name="salesOpportunityId" type="id-ne"></field> - <field name="competitorPartyId" type="id-ne"></field> + <field name="salesOpportunityId" type="id"></field> + <field name="competitorPartyId" type="id"></field> <field name="positionEnumId" type="id-ne"></field> <field name="strengths" type="very-long"></field> <field name="weaknesses" type="very-long"></field> @@ -918,8 +918,8 @@ under the License. <entity entity-name="SalesOpportunityTrckCode" package-name="org.apache.ofbiz.marketing.opportunity" title="Sales opportunity traking code"> - <field name="salesOpportunityId" type="id-ne"></field> - <field name="trackingCodeId" type="id-ne"></field> + <field name="salesOpportunityId" type="id"></field> + <field name="trackingCodeId" type="id"></field> <field name="receivedDate" type="date-time"></field> <prim-key field="salesOpportunityId"/> <prim-key field="trackingCodeId"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |