svn commit: r834326 - in /ofbiz/trunk/applications: commonext/documents/ humanres/ humanres/data/ humanres/data/helpdata/ humanres/documents/

[hansbak-2]

Author: hansbak
Date: Tue Nov 10 03:32:46 2009
New Revision: 834326

URL: http://svn.apache.org/viewvc?rev=834326&view=rev
Log:
HR contribution by Sharan OFBIZ-2219

Added:
    ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR.xml
      - copied unchanged from r834286, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HUMANRES.xml
    ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_main.xml
      - copied unchanged from r834286, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HUMANRES_main.xml
    ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_training.xml
      - copied unchanged from r834286, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HUMANRES_training.xml
Removed:
    ofbiz/trunk/applications/humanres/data/helpdata/HELP_HUMANRES.xml
    ofbiz/trunk/applications/humanres/data/helpdata/HELP_HUMANRES_main.xml
    ofbiz/trunk/applications/humanres/data/helpdata/HELP_HUMANRES_training.xml
Modified:
    ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml
    ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml
    ofbiz/trunk/applications/humanres/documents/Humanres.xml
    ofbiz/trunk/applications/humanres/ofbiz-component.xml

Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml?rev=834326&r1=834325&r2=834326&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml Tue Nov 10 03:32:46 2009
@@ -48,6 +48,7 @@
     <xi:include href="../../../applications/product/documents/Product.xml"/>
     <xi:include href="../../../applications/content/documents/Content.xml"/>
     <xi:include href="../../../applications/marketing/documents/Marketing.xml"/>
+    <xi:include href="../../../applications/humanres/documents/Humanres.xml"/>
     <xi:include href="../../../specialpurpose/myportal/documents/MyPortal.xml"/>
     
     <appendix>

Modified: ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml?rev=834326&r1=834325&r2=834326&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml Tue Nov 10 03:32:46 2009
@@ -18,22 +18,22 @@
 under the License.
 -->
 <entity-engine-xml>
-    <DataResource dataResourceId="HELP_HUMANRES" localeString="en" dataResourceTypeId="OFBIZ_FILE"
-        objectInfo="applications/humanres/data/helpdata/HELP_HUMANRES.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
+    <DataResource dataResourceId="HELP_HR" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+        objectInfo="applications/humanres/data/helpdata/HELP_HR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
         dataResourceName="Human Resources Overview" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HELP_HUMANRES" contentTypeId="DOCUMENT" contentName="Human Resources Overview" templateDataResourceId="HELP_TEMPL"
-        dataResourceId="HELP_HUMANRES" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_HUMANRES" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000"/>
+    <Content contentId="HELP_HR" contentTypeId="DOCUMENT" contentName="Human Resources Overview" templateDataResourceId="HELP_TEMPL"
+        dataResourceId="HELP_HR" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_HR" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000"/>
 
-    <DataResource dataResourceId="HUMANRES_main" localeString="en" dataResourceTypeId="OFBIZ_FILE"
-        objectInfo="applications/humanres/data/helpdata/HELP_HUMANRES_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human Resources Main Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HUMANRES_main" contentTypeId="DOCUMENT" contentName="Human Resources Main." templateDataResourceId="HELP_TEMPL" dataResourceId="HUMANRES_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_HUMANRES" contentIdTo="HUMANRES_main" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HUMANRES_main"/>
+    <DataResource dataResourceId="HR_main" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+        objectInfo="applications/humanres/data/helpdata/HELP_HR_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human Resources Main Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="HR_main" contentTypeId="DOCUMENT" contentName="Human Resources Main." templateDataResourceId="HELP_TEMPL" dataResourceId="HR_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_main" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HR_main"/>
     
     <!-- training -->    
-    <DataResource dataResourceId="HUMANRES_training" localeString="en" dataResourceTypeId="OFBIZ_FILE"
-      objectInfo="applications/humanres/data/helpdata/HELP_HUMANRES_training.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human Resources Training Help" mimeTypeId="text/xml" isPublic="Y" />
-  <Content contentId="HUMANRES_training" contentTypeId="DOCUMENT" contentName="Training." templateDataResourceId="HELP_TEMPL" dataResourceId="HUMANRES_training" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-  <ContentAssoc contentId="HELP_HUMANRES" contentIdTo="HUMANRES_training" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HUMANRES_training"/>
+    <DataResource dataResourceId="HR_training" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+      objectInfo="applications/humanres/data/helpdata/HELP_HR_training.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human Resources Training Help" mimeTypeId="text/xml" isPublic="Y" />
+  <Content contentId="HR_training" contentTypeId="DOCUMENT" contentName="Training." templateDataResourceId="HELP_TEMPL" dataResourceId="HR_training" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+  <ContentAssoc contentId="HELP_HR" contentIdTo="HR_training" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HR_training"/>
     
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/humanres/documents/Humanres.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/documents/Humanres.xml?rev=834326&r1=834325&r2=834326&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/documents/Humanres.xml (original)
+++ ofbiz/trunk/applications/humanres/documents/Humanres.xml Tue Nov 10 03:32:46 2009
@@ -34,15 +34,16 @@
     </para>
     
   </section>
-  
-    <!--xi:include href="../data/helpdata/HELP_HUMANRES.xml" />
-    <xi:include href="../data/helpdata/HELP_HUMANRES_main.xml" />
-    <xi:include href="../data/helpdata/HELP_HUMANRES_employees.xml" />
+  
+   <xi:include href="../data/helpdata/HELP_HR.xml" />
+   <xi:include href="../data/helpdata/HELP_HR_main.xml" />
+   <xi:include href="../data/helpdata/HELP_HR_training.xml" />
+    
+    <!-- xi:include href="../data/helpdata/HELP_HUMANRES_employees.xml" />
     <xi:include href="../data/helpdata/HELP_HUMANRES_employees_positions.xml" />
     <xi:include href="../data/helpdata/HELP_HUMANRES_performance_review.xml" />
     <xi:include href="../data/helpdata/HELP_HUMANRES_skills.xml" />
     <xi:include href="../data/helpdata/HELP_HUMANRES_recruitment.xml" /-->
-    <xi:include href="../data/helpdata/HELP_HUMANRES_training.xml" />
     <!--xi:include href="../data/helpdata/HELP_HUMANRES_employment_applications.xml" />
     <xi:include href="../data/helpdata/HELP_HUMANRES_resumes.xml" />
     <xi:include href="../data/helpdata/HELP_HUMANRES_leave.xml" />

Modified: ofbiz/trunk/applications/humanres/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/ofbiz-component.xml?rev=834326&r1=834325&r2=834326&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/humanres/ofbiz-component.xml Tue Nov 10 03:32:46 2009
@@ -27,6 +27,7 @@
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResTypeData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResDemoData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>