You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/05/24 08:59:31 UTC
svn commit: r659756 -
/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
Author: ashish
Date: Fri May 23 23:59:28 2008
New Revision: 659756
URL: http://svn.apache.org/viewvc?rev=659756&view=rev
Log:
Removed the relationship of PayHistory with the PerformanceReview.(This was the optional relationship in DataModel Resource book and I thought it can be better handled by only Employment entity.)
So we should maintain the PayHistory from the Employment only.
Corrected the PrimaryKey for PositionTypeRate.
Modified:
ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=659756&r1=659755&r2=659756&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Fri May 23 23:59:28 2008
@@ -136,11 +136,6 @@
<field name="managerRoleTypeId" type="id"></field>
<field name="paymentId" type="id"></field>
<field name="emplPositionId" type="id"></field>
- <field name="payHistoryRoleTypeIdFrom" type="id"></field>
- <field name="payHistoryRoleTypeIdTo" type="id"></field>
- <field name="payHistoryPartyIdFrom" type="id"></field>
- <field name="payHistoryPartyIdTo" type="id"></field>
- <field name="payHistoryFromDate" type="date-time"></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
<field name="comments" type="comment"></field>
@@ -167,20 +162,6 @@
<relation type="one-nofk" fk-name="PERF_REV_PSTN" rel-entity-name="EmplPosition">
<key-map field-name="emplPositionId"/>
</relation>
- <relation type="one" fk-name="PERF_REV_PHFPTY" title="PayHistoryFrom" rel-entity-name="Party">
- <key-map field-name="payHistoryPartyIdFrom" rel-field-name="partyId"/>
- </relation>
- <relation type="one" fk-name="PERF_REV_PHFPRL" title="PayHistoryFrom" rel-entity-name="PartyRole">
- <key-map field-name="payHistoryPartyIdFrom" rel-field-name="partyId"/>
- <key-map field-name="payHistoryRoleTypeIdFrom" rel-field-name="roleTypeId"/>
- </relation>
- <relation type="one" fk-name="PERF_REV_PHTPTY" title="PayHistoryTo" rel-entity-name="Party">
- <key-map field-name="payHistoryPartyIdTo" rel-field-name="partyId"/>
- </relation>
- <relation type="one" fk-name="PERF_REV_PHTPRL" title="PayHistoryTo" rel-entity-name="PartyRole">
- <key-map field-name="payHistoryPartyIdTo" rel-field-name="partyId"/>
- <key-map field-name="payHistoryRoleTypeIdTo" rel-field-name="roleTypeId"/>
- </relation>
</entity>
<entity entity-name="PerfReviewItem"
package-name="org.ofbiz.humanres.ability"
@@ -731,12 +712,14 @@
title="EmplPosition Type Rate Entity">
<field name="emplPositionTypeId" type="id-ne"/>
<field name="periodTypeId" type="id-ne"/>
+ <field name="payGradeId" type="id"/>
<field name="salaryStepSeqId" type="id"/>
<field name="rateTypeId" type="id"/>
- <field name="payGradeId" type="id"/>
<field name="fromDate" type="date-time"/>
<field name="thruDate" type="date-time"/>
<field name="rate" type="id"/>
+ <prim-key field="emplPositionTypeId"/>
+ <prim-key field="periodTypeId"/>
<prim-key field="fromDate"/>
<relation type="one" fk-name="EMPL_PSTPRT_EPTP" rel-entity-name="EmplPositionType">
<key-map field-name="emplPositionTypeId"/>