svn commit: r1234035 - in /ofbiz/trunk: applications/humanres/data/HumanResTypeData.xml framework/common/config/CommonEntityLabels.xml

[erwan]

Author: erwan
Date: Fri Jan 20 17:57:24 2012
New Revision: 1234035

URL: http://svn.apache.org/viewvc?rev=1234035&view=rev
Log:
Adding missing training statuses, as they are used in forms but not created in base. Adding entity labels related

Modified:
    ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
    ofbiz/trunk/framework/common/config/CommonEntityLabels.xml

Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=1234035&r1=1234034&r2=1234035&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Fri Jan 20 17:57:24 2012
@@ -50,7 +50,10 @@ under the License.
     <StatusItem statusId="STATUS_RELOCATED" statusTypeId="RELOCATION_STATUS"  description="Relocated"/>
     
     <StatusType statusTypeId="TRAINING_STATUS" description="Training Status"/>
+    <StatusItem statusId="TRAINING_APPLIED" statusTypeId="TRAINING_STATUS"  description="Applied"/>
     <StatusItem statusId="TRAINING_APPROVED" statusTypeId="TRAINING_STATUS"  description="Approved"/>
+    <StatusItem statusId="TRAINING_ASSIGNED" statusTypeId="TRAINING_STATUS"  description="Assigned"/>
+    <StatusItem statusId="TRAINING_PROPOSED" statusTypeId="TRAINING_STATUS"  description="Proposed"/>
     <StatusItem statusId="TRAINING_REJECTED" statusTypeId="TRAINING_STATUS"  description="Rejected"/>
 
     <StatusType statusTypeId="LEAVE_STATUS" description="Employee Leave Status"/>

Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=1234035&r1=1234034&r2=1234035&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Fri Jan 20 17:57:24 2012
@@ -10341,6 +10341,10 @@
         <value xml:lang="zh">处理中</value>
         <value xml:lang="zh_TW">處理中</value>
     </property>
+    <property key="StatusItem.description.TRAINING_APPLIED">
+        <value xml:lang="en">Applied</value>
+        <value xml:lang="fr">Postulée</value>
+    </property>
     <property key="StatusItem.description.TRAINING_APPROVED">
         <value xml:lang="en">Approved</value>
         <value xml:lang="es">Aprobado</value>
@@ -10350,6 +10354,10 @@
         <value xml:lang="pt_BR">Aprovado</value>
         <value xml:lang="zh">已批准</value>
     </property>
+    <property key="StatusItem.description.TRAINING_ASSIGNED">
+        <value xml:lang="en">Assigned</value>
+        <value xml:lang="fr">Affecté</value>
+    </property>
     <property key="StatusItem.description.TRAINING_PROPOSED">
         <value xml:lang="de">Vorgeschlagen</value>
         <value xml:lang="en">Proposed</value>