Author: erwan
Date: Tue Jan 17 17:57:31 2012
New Revision: 1232509
URL: http://svn.apache.org/viewvc?rev=1232509&view=rev
Log:
Entitylabels for EmplLeaveReasonType
Modified:
ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml
ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
Modified: ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml?rev=1232509&r1=1232508&r2=1232509&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml Tue Jan
17 17:57:31 2012
@@ -20,6 +20,14 @@
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <property key="EmplLeaveReasonType.description.CASUAL">
+ <value xml:lang="en">Casual</value>
+ <value xml:lang="fr">Convenance</value>
+ </property>
+ <property key="EmplLeaveReasonType.description.MEDICAL">
+ <value xml:lang="en">Medical</value>
+ <value xml:lang="fr">Maladie</value>
+ </property>
<property key="EmplLeaveType.description.INLAND_EARNED">
<value xml:lang="en">Inland earned</value>
<value xml:lang="fr">Congé payé</value>
Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=1232509&r1=1232508&r2=1232509&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Tue Jan 17
17:57:31 2012
@@ -150,8 +150,8 @@ under the License.
<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"/>
- <EmplLeaveReasonType description="Medical" hasTable="N" parentTypeId=""
emplLeaveReasonTypeId="Fever"/>
- <EmplLeaveReasonType description="Casual" hasTable="N" parentTypeId=""
emplLeaveReasonTypeId="Personal Work"/>
+ <EmplLeaveReasonType emplLeaveReasonTypeId="MEDICAL" description="Medical"
hasTable="N"/>
+ <EmplLeaveReasonType emplLeaveReasonTypeId="CASUAL" description="Casual"
hasTable="N"/>
<PerfReviewItemType perfReviewItemTypeId="TECH" hasTable="N"
description="Technical skills"/>
<PerfReviewItemType perfReviewItemTypeId="RESP" hasTable="N"
description="Responsibility"/>
Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=1232509&r1=1232508&r2=1232509&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Tue Jan 17
17:57:31 2012
@@ -949,6 +949,7 @@ under the License.
</entity>
<entity entity-name="EmplLeaveReasonType"
package-name="org.ofbiz.humanres.employment"
+ default-resource-name="HumanResEntityLabels"
title="Leave Reason Type Entity">
<field name="emplLeaveReasonTypeId" type="id-ne"/>
<field name="parentTypeId" type="id-ne"/>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=1232509&r1=1232508&r2=1232509&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Tue Jan
17 17:57:31 2012
@@ -67,6 +67,7 @@
</display-entity>
</field>
<field name="leaveTypeId"><display-entity
entity-name="EmplLeaveType"/></field>
+ <field name="emplLeaveReasonTypeId"><display-entity
entity-name="EmplLeaveReasonType"/></field>
<field name="approverPartyId">
<display-entity entity-name="PartyNameView"
description="${firstName} ${lastName}" key-field-name="partyId">
<sub-hyperlink target="/partymgr/control/viewprofile"
target-type="inter-app" description="${approverPartyId}"
link-style="buttontext">
@@ -146,6 +147,7 @@
</display-entity>
</field>
<field name="leaveTypeId"><display-entity
entity-name="EmplLeaveType"/></field>
+ <field name="emplLeaveReasonTypeId"><display-entity
entity-name="EmplLeaveReasonType"/></field>
<field name="approverPartyId" field-name="approverPartyId">
<display-entity entity-name="PartyNameView"
description="${firstName} ${lastName}" key-field-name="partyId">
<sub-hyperlink target="/partymgr/control/viewprofile"
target-type="inter-app" description="${approverPartyId}"
link-style="buttontext">
