Author: jleroux
Date: Fri Oct 30 08:33:45 2015
New Revision: 1711426
URL:
http://svn.apache.org/viewvc?rev=1711426&view=revLog:
Fixes warnings appearing in log, thanks to Adrian on dev ML
Modified:
ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
ofbiz/trunk/applications/humanres/entitydef/entitymodel_old.xml
Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=1711426&r1=1711425&r2=1711426&view=diff==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Fri Oct 30 08:33:45 2015
@@ -607,7 +607,7 @@ under the License.
<prim-key field="salaryStepSeqId"/>
<prim-key field="payGradeId"/>
<prim-key field="fromDate"/>
- <relation type="one" fk-name="SLRY_STP_PGRD" rel-entity-name="PayGrade">
+ <relation type="one" fk-name="SLRY_STP_PGRD_NEW" rel-entity-name="PayGrade">
<key-map field-name="payGradeId"/>
</relation>
</entity>
Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel_old.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel_old.xml?rev=1711426&r1=1711425&r2=1711426&view=diff==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel_old.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel_old.xml Fri Oct 30 08:33:45 2015
@@ -44,7 +44,7 @@ under the License.
<relation type="one" fk-name="EMPL_PSTPRT_PRDTYP" rel-entity-name="PeriodType">
<key-map field-name="periodTypeId"/>
</relation>
- <relation type="one-nofk" fk-name="EMPL_PSTPRT_SSTP" rel-entity-name="SalaryStep">
+ <relation type="one-nofk" fk-name="EMPL_PSTPRT_SSTP" rel-entity-name="OldSalaryStep">
<key-map field-name="salaryStepSeqId"/>
<key-map field-name="payGradeId"/>
</relation>