Author: sharan
Date: Wed Feb  4 10:04:30 2015
New Revision: 1657079

URL: http://svn.apache.org/r1657079
Log:
Applied fix from trunk for revision: 1654509 
===

OFBIZ 6015 - added more HR help pages

Added:
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml
      - copied unchanged from r1654509, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml
Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/humanres/data/HumanResHelpData.xml
    ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR.xml
    
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_main.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  4 10:04:30 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1655046,1655668,1655979,1656185,1656198,1656445,1656983
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983

Modified: 
ofbiz/branches/release14.12/applications/humanres/data/HumanResHelpData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/humanres/data/HumanResHelpData.xml?rev=1657079&r1=1657078&r2=1657079&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/humanres/data/HumanResHelpData.xml 
(original)
+++ ofbiz/branches/release14.12/applications/humanres/data/HumanResHelpData.xml 
Wed Feb  4 10:04:30 2015
@@ -29,8 +29,87 @@ under the License.
         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="HUMANRES_main"/>
-    
-    <!-- training -->    
+   
+    <!-- employees -->    
+    <DataResource dataResourceId="HR_findEmployees" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_findEmployees.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Find Employees Help" mimeTypeId="text/xml" isPublic="Y" />
+   <Content contentId="HR_findEmployees" contentTypeId="DOCUMENT" 
contentName="Find Employees" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_findEmployees" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_findEmployees" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_FindEmployee"/>
+  
+     <DataResource dataResourceId="HR_NewEmployee" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      objectInfo="applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources New Employee Help" mimeTypeId="text/xml" isPublic="Y" />
+   <Content contentId="HR_NewEmployee" contentTypeId="DOCUMENT" 
contentName="New Employee" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_NewEmployee" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_NewEmployee" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_NewEmployee"/>
+
+        <DataResource dataResourceId="HR_EmployeeProfile" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Employee Profile Help" mimeTypeId="text/xml" isPublic="Y" />
+   <Content contentId="HR_EmployeeProfile" contentTypeId="DOCUMENT" 
contentName="Employee Profile" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_EmployeeProfile" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_EmployeeProfile" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_EmployeeProfile"/>
+
+        <DataResource dataResourceId="HR_EditEmployeeSkill" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Employee Skills Help" mimeTypeId="text/xml" isPublic="Y" />
+   <Content contentId="HR_EditEmployeeSkill" contentTypeId="DOCUMENT" 
contentName="Employee Skills" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_EditEmployeeSkill" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_EditEmployeeSkill" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_EditEmployeeSkills"/>
+
+        <DataResource dataResourceId="HR_EditEmployeeQuals" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Employee Qualifications Help" mimeTypeId="text/xml" isPublic="Y" />
+   <Content contentId="HR_EditEmployeeQuals" contentTypeId="DOCUMENT" 
contentName="Employee Qualifications" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_EditEmployeeQuals" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_EditEmployeeQuals" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_EditEmployeeQuals"/>
+
+        <DataResource dataResourceId="HR_EditEmployeeLeave" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Employee Leave Help" mimeTypeId="text/xml" isPublic="Y" />
+   <Content contentId="HR_EditEmployeeLeave" contentTypeId="DOCUMENT" 
contentName="Employee Leave" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_EditEmployeeLeave" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_EditEmployeeLeave" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_EditEmployeeLeaves"/>
+
+        <DataResource dataResourceId="HR_EditEmployeeTrain" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml"
 dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Employee Training Help" mimeTypeId="text/xml" isPublic="Y" />
+   <Content contentId="HR_EditEmployeeTrain" contentTypeId="DOCUMENT" 
contentName="Employee Training" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_EditEmployeeTrain" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_EditEmployeeTrain" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_EditEmployeeTrainings"/>
+
+        <DataResource dataResourceId="HR_PayrollHistory" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Payroll History Help" mimeTypeId="text/xml" isPublic="Y" />
+   <Content contentId="HR_PayrollHistory" contentTypeId="DOCUMENT" 
contentName="Payroll History" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_PayrollHistory" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_PayrollHistory" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_PayrollHistory"/>
+
+
+    <!-- employments -->    
+    <DataResource dataResourceId="HR_FindEmployments" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Find Employments Help" mimeTypeId="text/xml" isPublic="Y" />
+  <Content contentId="HR_FindEmployments" contentTypeId="DOCUMENT" 
contentName="Find Employments" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_FindEmployments" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_FindEmployments" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_FindEmployments"/>
+  
+   <DataResource dataResourceId="HR_EditEmployment" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Edit Employment Help" mimeTypeId="text/xml" isPublic="Y" />
+  <Content contentId="HR_EditEmployment" contentTypeId="DOCUMENT" 
contentName="Edit Employment" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_EditEmployment" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_EditEmployment" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_EditEmployment"/>
+  
+    <DataResource dataResourceId="HR_ListEmployments" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources List Employments Help" mimeTypeId="text/xml" isPublic="Y" />
+  <Content contentId="HR_ListEmployments" contentTypeId="DOCUMENT" 
contentName="List Employments" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_ListEmployments" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_ListEmployments" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_ListEmployments"/>
+  
+  <!-- employee positions -->    
+    <DataResource dataResourceId="HR_FindEmplPositions" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Find Employee Positions Help" mimeTypeId="text/xml" isPublic="Y" />
+  <Content contentId="HR_FindEmplPositions" contentTypeId="DOCUMENT" 
contentName="Find Employee Positions" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_FindEmplPositions" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_FindEmplPositions" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_FindEmplPositions"/>
+ 
+   <DataResource dataResourceId="HR_ListEmplPositions" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources List Employee Positions Help" mimeTypeId="text/xml" isPublic="Y" />
+  <Content contentId="HR_ListEmplPositions" contentTypeId="DOCUMENT" 
contentName="List Employee Positions" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_ListEmplPositions" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_ListEmplPositions" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_ListEmplPositions"/>
+  
+   <DataResource dataResourceId="HR_EditEmplPosition" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources Edit Employee Position Help" mimeTypeId="text/xml" isPublic="Y" />
+  <Content contentId="HR_EditEmplPosition" contentTypeId="DOCUMENT" 
contentName="Edit Employee Position" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_EditEmplPosition" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_EditEmplPosition" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_EditEmplPosition"/>
+  
+   <DataResource dataResourceId="HR_EmplPositionView" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
+      
objectInfo="applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human 
Resources View Employee Position Help" mimeTypeId="text/xml" isPublic="Y" />
+  <Content contentId="HR_EmplPositionView" contentTypeId="DOCUMENT" 
contentName="View Employee Position" templateDataResourceId="HELP_TEMPL" 
dataResourceId="HR_EmplPositionView" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_HR" contentIdTo="HR_EmplPositionView" 
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" 
sequenceNum="000" mapKey="HUMANRES_EmplPositionView"/>
+ 
+  <!-- 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"/>

Modified: 
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR.xml?rev=1657079&r1=1657078&r2=1657079&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR.xml 
(original)
+++ ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR.xml 
Wed Feb  4 10:04:30 2015
@@ -23,24 +23,23 @@ under the License.
   xmlns="http://docbook.org/ns/docbook";>
   <title>Human Resources Introduction</title>
     
-   <title>About OFBiz Human Resources</title>
-    <para>The people who work for your company, it's human capital, are it's
-    most important asset. Selecting a software platform that increases the
-    value of your companies human capital and delivers benefits, services and
-    opportunities to your workforce, is critical to your companies success
+   <para>The people who work for your company, are its most important asset.
+    They are human capital. Selecting a software platform that increases the
+    value of your company's human capital and delivers benefits, services and
+    opportunities to your workforce, is critical to your company's success
     .</para>
   
-  <para>That platform must be able to accurately and reliability process
+  <para>The platform must be able to accurately and reliability process
     worker transactions, collect decision support information, and communicate
-    between management, workers and outside resources. The OFBiz Human
-    Resource application (HR App) can provide a backbone for building that
-    platform.</para>
+    between management, workers and outside resources.</para> 
     
-     <para>In this chapter you are introduced to the organization of this
-    document and to the key business objects that are the core to HR
-    App.</para>
+   <para> The OFBiz Human Resource Application (HR App) can provide a backbone 
for 
+   building that platform.</para>
+    
+     <para>In this section we introduce you to the organization of this
+    guide and to the key business objects that are the core to Human 
Resources.</para>
 
-        <para>In the HR App you can:</para>
+        <para>In the Human Resources Application you can:</para>
 
         <itemizedlist>
           <listitem>

Modified: 
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_main.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_main.xml?rev=1657079&r1=1657078&r2=1657079&view=diff
==============================================================================
--- 
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_main.xml
 (original)
+++ 
ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_main.xml
 Wed Feb  4 10:04:30 2015
@@ -24,30 +24,29 @@ under the License.
   <title>The Human Resources Main screen.</title>
   
   
-    <para>The Main window is the entry point into the HR App and displays the
-    Company tree view for navigating to key HR App items.</para>
+    <para>The Main window is the entry point into the Human Resources 
Application and displays the
+    Company tree view for navigating to the main menu items.</para>
     
-  <para> This screen will show the the organization of your company, the top 
level company is defined in a system setup file: general.properties.
-        The system will list devisions and departments in the role 
&quot;Internal organization&quot; as defined in the party relationships 
-        as a &quot;Group member&quot; under it in as many levels as required.
-  </para>
-  
+  <para> This screen will display the organizational setup of your Company. 
The top level Company is defined in a system setup file: 
general.properties.</para>
   <para>
-        related to an &quot;Internal Organization&quot; is an employee 
position which can be full filled by an employee in an employment. 
-  </para>
-   <title> Nodes In the Company Tree</title>
+        The system will also list any divisions or departments that have been 
setup with the role &quot;Internal organization&quot; as defined in the party 
relationships 
+        as a &quot;Group member&quot;. </para>
+        
+  <para>The number of organizational levels can be as many as required.</para>
+  
+     <title> Nodes In the Company Tree</title>
 
     <para>There are three node types in the tree, each identified by a
     different icon. The top of the tree represents your Company, the highest
-    level in the HR App organization. The Company and departments under the
-    Company can have children departments or positions. Under positions are
+    level in the organization. The Company and departments under the
+    Company can have sub departments or positions. Under positions are
     the people who fulfill the position.</para>
   
     <title>Usage</title>
 
     <itemizedlist>
       <listitem>
-        <para>Navigate the HR Organization to view departments, positions and
+        <para>Navigate the organization to view departments, positions and
         people</para>
       </listitem>
 


Reply via email to