You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/10/18 00:04:59 UTC
svn commit: r1709214 -
/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
Author: jleroux
Date: Sat Oct 17 22:04:59 2015
New Revision: 1709214
URL: http://svn.apache.org/viewvc?rev=1709214&view=rev
Log:
Completes r1709192 for Changes for "SalaryStep entity missing From and Thru dates" https://issues.apache.org/jira/browse/OFBIZ-5758
I decided other changes (adding a fromDate), notably in "Position Type Rate" and "Lookup Salary StepSeq Id" were not necessary
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=1709214&r1=1709213&r2=1709214&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Sat Oct 17 22:04:59 2015
@@ -551,6 +551,7 @@ under the License.
<relation type="one-nofk" fk-name="PAY_HIST_SSTP" rel-entity-name="SalaryStep">
<key-map field-name="salaryStepSeqId"/>
<key-map field-name="payGradeId"/>
+ <key-map field-name="fromDate"/>
</relation>
<relation type="one" fk-name="PAY_HIST_PDTP" rel-entity-name="PeriodType">
<key-map field-name="periodTypeId"/>
@@ -840,6 +841,7 @@ under the License.
<relation type="one-nofk" fk-name="EMPL_PTPRT_SSTP" rel-entity-name="SalaryStep">
<key-map field-name="salaryStepSeqId"/>
<key-map field-name="payGradeId"/>
+ <key-map field-name="fromDate"/>
</relation>
<relation type="one-nofk" fk-name="EMPL_PTPRT_RTTYP" rel-entity-name="RateType">
<key-map field-name="rateTypeId"/>