svn commit: r1654682 [1/6] - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/widget/ applications/content/widget/layout/ applications/humanres/data/ applications/humanres/data/helpdata/ applications/manufacturin...

Sun, 25 Jan 2015 10:31:16 -0800 

Author: jleroux
Date: Sun Jan 25 18:31:01 2015
New Revision: 1654682

URL: http://svn.apache.org/r1654682
Log:
Keeps in sync with OFBiz trunk HEAD

Added:
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/GridFactory.java
      - copied unchanged from r1654681, 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/GridFactory.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java
      - copied unchanged from r1654681, 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java
      - copied unchanged from r1654681, 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/PortalAdmForms.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/PortalAdmScreens.xml
      - copied unchanged from r1654514, 
ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmScreens.xml
Removed:
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/widget/PortalAdmForms.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/widget/PortalAdmScreens.xml
Modified:
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/   (props changed)
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetScreens.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/layout/LayoutForms.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/HumanResHelpData.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_main.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingEntityLabels.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/FieldLookupForms.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/QuoteForms.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyEntityLabels.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/testdef/FacilityTest.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductScreens.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/config/WebtoolsUiLabels.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/main.ftl
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/widget/Menus.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/FormFactory.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/ModelForm.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/ModelWidgetVisitor.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/XmlWidgetVisitor.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/webapp/view/JspViewHandler.java
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/config/MyPortalUiLabels.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/CommonScreens.xml
    
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/MyPortalMenus.xml

Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 25 18:31:01 2015
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1535158-1652966
+/ofbiz/trunk:1535158-1654681

Modified: 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml?rev=1654682&r1=1654681&r2=1654682&view=diff
==============================================================================
--- 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml
 (original)
+++ 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml
 Sun Jan 25 18:31:01 2015
@@ -21,7 +21,7 @@ under the License.
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
         
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd";>
     <!-- list all assets in a tabular format -->
-    <form name="ListFixedAssets" type="list" list-name="listIt" 
paginate-target="ListFixedAssets"
+    <grid name="ListFixedAssets" type="list" list-name="listIt" 
paginate-target="ListFixedAssets"
         odd-row-style="alternate-row" header-row-style="header-row-2" 
default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map="result" 
result-map-list="listIt">
@@ -60,7 +60,7 @@ under the License.
         <field name="depreciation" sort-field="true"><display type="currency" 
currency="${purchaseCostUomId}"/></field>
         <field name="plannedPastDepreciationTotal"><display 
description="${assetDepreciationResultMap.plannedPastDepreciationTotal}"/></field>
         <on-event-update-area event-type="paginate" area-id="search-results" 
area-target="FixedAssetSearchResults"/>
-    </form>
+    </grid>
 
     <form name="FindFixedAssetOptions" extends="lookupFixedAsset" 
extends-resource="component://accounting/widget/FieldLookupForms.xml"
         target="ListFixedAssets">

Modified: 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetScreens.xml?rev=1654682&r1=1654681&r2=1654682&view=diff
==============================================================================
--- 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetScreens.xml
 (original)
+++ 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetScreens.xml
 Sun Jan 25 18:31:01 2015
@@ -68,7 +68,7 @@ under the License.
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" 
global="true"/>
             </actions>
             <widgets>
-                <include-form name="ListFixedAssets" 
location="component://accounting/widget/FixedAssetForms.xml"/>
+                <include-grid name="ListFixedAssets" 
location="component://accounting/widget/FixedAssetForms.xml"/>
             </widgets>
         </section>
     </screen>

Modified: 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/layout/LayoutForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/layout/LayoutForms.xml?rev=1654682&r1=1654681&r2=1654682&view=diff
==============================================================================
--- 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/layout/LayoutForms.xml
 (original)
+++ 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/layout/LayoutForms.xml
 Sun Jan 25 18:31:01 2015
@@ -37,13 +37,13 @@ under the License.
             <text-find/>
         </field>
         <field name="createdByUserLogin">
-             <lookup target-form-name="LookupPerson"/>
+             <lookup target-form-name="LookupUserLoginAndPartyDetails"/>
         </field>
         <field name="createdDate">
             <date-find/>
         </field>
         <field name="lastModifiedByUserLogin">
-             <lookup target-form-name="LookupParty"/>
+             <lookup target-form-name="LookupUserLoginAndPartyDetails"/>
         </field>
         <field name="lastModifiedDate">
             <date-find/>

Modified: 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/HumanResHelpData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/HumanResHelpData.xml?rev=1654682&r1=1654681&r2=1654682&view=diff
==============================================================================
--- 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/HumanResHelpData.xml
 (original)
+++ 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/HumanResHelpData.xml
 Sun Jan 25 18:31:01 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/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR.xml?rev=1654682&r1=1654681&r2=1654682&view=diff
==============================================================================
--- 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR.xml
 (original)
+++ 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR.xml
 Sun Jan 25 18:31:01 2015
@@ -22,5 +22,44 @@ under the License.
   xsi:schemaLocation="http://docbook.org/ns/docbook 
../../../content/dtd/docbook.xsd"
   xmlns="http://docbook.org/ns/docbook";>
   <title>Human Resources Introduction</title>
-  <para>WIP, to be continued...</para>
+    
+   <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>The platform must be able to accurately and reliability process
+    worker transactions, collect decision support information, and communicate
+    between management, workers and outside resources.</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 Human Resources Application you can:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>Create positions</para>
+          </listitem>
+
+          <listitem>
+            <para>Fulfill positions</para>
+          </listitem>
+
+          <listitem>
+            <para>Define the responsibilities of a position</para>
+          </listitem>
+
+          <listitem>
+            <para>Define a tree reporting structure between positions</para>
+          </listitem>
+
+          <listitem>
+            <para>Track the positions fulfillments over time</para>
+          </listitem>
+        </itemizedlist>
 </section>

Modified: 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_main.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_main.xml?rev=1654682&r1=1654681&r2=1654682&view=diff
==============================================================================
--- 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_main.xml
 (original)
+++ 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/data/helpdata/HELP_HR_main.xml
 Sun Jan 25 18:31:01 2015
@@ -22,11 +22,50 @@ under the License.
   xsi:schemaLocation="http://docbook.org/ns/docbook 
../../../content/dtd/docbook.xsd"
   xmlns="http://docbook.org/ns/docbook";>
   <title>The Human Resources Main screen.</title>
-  <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>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 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>
+        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 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 organization to view departments, positions and
+        people</para>
+      </listitem>
+
+      <listitem>
+        <para>Add or remove a department</para>
+      </listitem>
+
+      <listitem>
+        <para>Add a person</para>
+      </listitem>
+
+      <listitem>
+        <para>Quickly open the profile of any item in the tree</para>
+      </listitem>
+
+      <listitem>
+        <para>If the item is a position you can add a person to fulfill the
+        position</para>
+      </listitem>
+    </itemizedlist>
+  
 </section>

Modified: 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingEntityLabels.xml?rev=1654682&r1=1654681&r2=1654682&view=diff
==============================================================================
--- 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingEntityLabels.xml
 (original)
+++ 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingEntityLabels.xml
 Sun Jan 25 18:31:01 2015
@@ -51,6 +51,7 @@
         <value xml:lang="fr">Besoin Mrp</value>
         <value xml:lang="it">Fabbisogno Mrp</value>
         <value xml:lang="ja">MRP要求</value>
+        <value xml:lang="nl">MRP - requirement</value>
         <value xml:lang="pt-BR">Requisito de Mrp</value>
         <value xml:lang="ro">Necesar Mrp</value>
         <value xml:lang="th">ความต้องการตาม 
Mrp</value>
@@ -103,6 +104,7 @@
         <value xml:lang="fr">Expédition de commande de vente</value>
         <value xml:lang="it">Spedizioni Ordini Vendita</value>
         <value xml:lang="ja">販売注文発送</value>
+        <value xml:lang="nl">Verkooporder - zending</value>
         <value xml:lang="pt-BR">Envio de pedido de vendas</value>
         <value xml:lang="ro">Expediere Comenzi Vanzare</value>
         <value 
xml:lang="th">การขนส่งสินค้าตามรายการขาย</value>
@@ -116,6 +118,7 @@
         <value xml:lang="fr">Calendrier utilisé par défaut quand aucun 
calendrier spécifique n'est défini</value>
         <value xml:lang="it">Calendario di Default usato quando nessun 
calendario specifico è definito</value>
         <value 
xml:lang="ja">カレンダが指定されない時に使用するデフォルトカレンダ</value>
+        <value xml:lang="nl">Standaard kalender</value>
         <value xml:lang="pt-BR">Calendário padrão utilizado quando não há 
um calendário específico definido</value>
         <value xml:lang="ro">Calendar de Default folosit atunci cand nici-un 
calendar specific nu este definit</value>
         <value 
xml:lang="th">ปฏิทินมาตรฐานใช้เมื่อไม่มีการระบุปฏิทินโดยเฉพาะ</value>
@@ -138,6 +141,7 @@
         <value xml:lang="fr">Calendrier d'atelier de séchage</value>
         <value xml:lang="it">Calendario Officina Asciugatura</value>
         <value xml:lang="ja">空のカレンダ</value>
+        <value xml:lang="nl">Kalender - drogen</value>
         <value xml:lang="pt-BR">Calendários do escritório de secagem</value>
         <value xml:lang="ro">Calendar Atelier Uscatorie</value>
         <value xml:lang="th">ปฏิทิน</value>
@@ -151,6 +155,7 @@
         <value xml:lang="fr">Calendrier d'atelier d'usinage</value>
         <value xml:lang="it">Calendario Officina Macchine</value>
         <value xml:lang="ja">一致するカレンダ</value>
+        <value xml:lang="nl">Kalender - manchines</value>
         <value xml:lang="pt-BR">Calendário do escritório de 
maquinário</value>
         <value xml:lang="ro">Calendar Atelier Masini</value>
         <value 
xml:lang="th">ปฏิทินของระบบการปฎิบัติงาน</value>
@@ -164,6 +169,7 @@
         <value xml:lang="fr">Calendrier utilisé pour le calcul de la date de 
commande répétitive de l'article acheté</value>
         <value xml:lang="it">Calendario usato per Ri-Ordini data calcolo per 
prodotti acquistati</value>
         <value xml:lang="ja">è³¼å…
¥è£½å“ã®æ³¨æ–‡æ—¥å†è¨ˆç®—に使用するカレンダ</value>
+        <value xml:lang="nl">Kalender - leverancier</value>
         <value xml:lang="pt-BR">Calendário usado para refazer pedidos de 
produtos já comprados</value>
         <value xml:lang="ro">Calendar folosit pentru Re-Ordonarea datelor de 
calcul a produselor cumparate</value>
         <value 
xml:lang="th">ปฏิทินใช้สำหรับวันที่มีการคำนวณรายการสั่งสินค้าสำหรับซื้อสินค้า</value>
@@ -177,6 +183,7 @@
         <value xml:lang="fr">8heures/jour</value>
         <value xml:lang="it">8 ore/giorno</value>
         <value xml:lang="ja">8時間/日</value>
+        <value xml:lang="nl">8 uur/dag</value>
         <value xml:lang="pt-BR">8 horas/dia</value>
         <value xml:lang="ro">8 ore/zi</value>
         <value xml:lang="th">8 ชั่วโมง/วัน</value>
@@ -199,6 +206,7 @@
         <value xml:lang="fr">Caldendrier des vacances (0 heure/jour, 0 
jour/semaine)</value>
         <value xml:lang="it">Calendario per il periodo di vacanze, 0 
ore/giorno 0 giorni/settimana</value>
         <value xml:lang="ja">休日</value>
+        <value xml:lang="nl">Feestdag / vakantie</value>
         <value xml:lang="pt-BR">Calendário de feriados, 0 horas/dia, 0 
dias/semana</value>
         <value xml:lang="ro">Calendar pentru perioada de vacanza, 0 ore/zi 0 
zile/saptamana</value>
         <value xml:lang="th">ปฏิทินวันหยุด</value>
@@ -212,6 +220,7 @@
         <value xml:lang="fr">Calendrier standard 24 heures, 7 jours</value>
         <value xml:lang="it">Calendario Standard aperto 24 ore al giorno 7 
giorni alla settimana</value>
         <value xml:lang="ja">標準カレンダ、24時間、7日</value>
+        <value xml:lang="nl">7 dagen/24 uur per dag</value>
         <value xml:lang="pt-BR">Calendário padrão de 24 horas e 7 dias por 
semana</value>
         <value xml:lang="ro">Calendar Standard deschis 24 ore pe zi 7 zile pe 
saptamana</value>
         <value 
xml:lang="th">ปฏิทินมาตรฐานกำหนดให้เป็น
 24 ชั่วโมงหรือ 7 วัน</value>
@@ -225,6 +234,7 @@
         <value xml:lang="fr">Calendrier standard 8heures/jour, 5 jours par 
semaine</value>
         <value xml:lang="it">Calendario Standard 8 ore/giorno 
5giorni/settimana con inizio alle 8:30 dal Lunedì al Venerdì</value>
         <value xml:lang="ja">標準カレンダ、8時間、5日</value>
+        <value xml:lang="nl">5 dagen/8 uur per dag</value>
         <value xml:lang="pt-BR">Calendário padrão de 8 horas/dia, 5 
dias/semana.</value>
         <value xml:lang="ro">Calendar Standard 8 ore/zi 5 zile /saptamana de 
la orele 8:30 de Luni pana Vineri</value>
         <value xml:lang="th">ปฏิทินมาตรฐาน 8 
ชั่วโมง/5 วัน/กำหนดให้เริ่ม 
8:30</value>
@@ -238,6 +248,7 @@
         <value xml:lang="fr">8 heures/jour, actuellement le precessus de 
renouvellement de commande converti le jour en mms à 8h/jour</value>
         <value xml:lang="it">8 ore/giorno, attualmente il Processo di 
Ri-Ordine converte il giorno a mms con 8h/giorno</value>
         <value 
xml:lang="ja">8時間/日、再注文プロセスが8時間/日で日数を変換します</value>
+        <value xml:lang="nl">8 uur per dag</value>
         <value xml:lang="pt-BR">8 horas/dia, atualmente o processo de refazer 
pedidos converte dia para mms.</value>
         <value xml:lang="ro">8 ore/zi, in prezent Procesul de Re-Ordinare 
converteste ziua in mms cu  8h/zi" mondayStartTime="08:30:00"</value>
         <value xml:lang="th">8 ชั่วโมง/วัน, 
ขณะนี้รายการสั่งซื้อกำลังประมวลผลในการเปลี่ยนวันไปเป็น
 mms ด้วย 8 ชั่วโมง/วัน</value>

Modified: 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml?rev=1654682&r1=1654681&r2=1654682&view=diff
==============================================================================
--- 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml
 (original)
+++ 
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml
 Sun Jan 25 18:31:01 2015
@@ -26,7 +26,7 @@
         <value xml:lang="fr">Un centre de profit doit être choisi pour une 
commande de vente.</value>
         <value xml:lang="it">Un Negozioe DEVE essere selezionato per un'Ordine 
di Vendita. </value>
         <value 
xml:lang="ja">販売注文に対して製品店舗を選択する必
要があります。</value>
-        <value xml:lang="nl">Er moet een winkel geselecteerd zijn voor een 
verkoopbestelling.</value>
+        <value xml:lang="nl">Er moet een winkel geselecteerd zijn voor een 
verkoopborder.</value>
         <value xml:lang="pt-BR">Um produto da loja deve estar selecionado para 
um pedido de venda</value>
         <value xml:lang="ro">TREBUIE sa selectionezi un magazin pentru o 
comanda de Vanzare. </value>
         <value xml:lang="ru">Для сбытового заказа 
ДОЛЖНА быть выбрана торговая точка. </value>
@@ -106,7 +106,7 @@
         <value xml:lang="fr">Impossible d'obtenir l'en-tête de la commande 
:</value>
         <value xml:lang="it">Non è possibile leggere testata ordine : </value>
         <value xml:lang="ja">注文ヘッダが取得できません: </value>
-        <value xml:lang="nl">Kan de bestellingkop niet ophalen : </value>
+        <value xml:lang="nl">Kan de orderkop niet ophalen : </value>
         <value xml:lang="pt-BR">Impossível obter cabeçalho do pedido</value>
         <value xml:lang="ro">Nu este posibila citerea Antetului Comenzii : 
</value>
         <value xml:lang="ru">Невозможно получить шапку 
заказа: </value>
@@ -122,7 +122,7 @@
         <value xml:lang="fr">Impossible de lire la ligne de la commande</value>
         <value xml:lang="it">Non è possibile leggere l'entità riga 
ordine</value>
         <value xml:lang="ja">注文アイテム
エンティティが読み込みできません</value>
-        <value xml:lang="nl">Kan de tabel met bestellingen niet lezen</value>
+        <value xml:lang="nl">Kan de tabel met orders niet lezen</value>
         <value xml:lang="pt-BR">Não foi possível ler o item do pedido</value>
         <value xml:lang="ro">Nu este posibila citerea entitatii linie 
comanda</value>
         <value xml:lang="ru">Невозможно прочитать 
объект позиции заказа</value>
@@ -170,7 +170,7 @@
         <value xml:lang="fr">Impossible de mettre à jour l'en-tête de 
commande [ ${orderId} ]</value>
         <value xml:lang="it">Non è possibile modificare a null testata ordine 
[ ${orderId} ]</value>
         <value 
xml:lang="ja">注文ヘッダが空のため更新できません [ ${orderId} 
]</value>
-        <value xml:lang="nl">Kan lege bestellingkop niet aanpassen [ 
${orderId} ]</value>
+        <value xml:lang="nl">Kan lege orderkop niet aanpassen [ ${orderId} 
]</value>
         <value xml:lang="pt-BR">Impossível atualizar cabeçalho de pedido 
vazio  [ ${orderId} ]</value>
         <value xml:lang="ro">Nu este posibila anularea Antetului comenzii[ 
${orderId} ]</value>
         <value xml:lang="ru">Невозможно обновить шапку 
заказа с пустым значением [ ${orderId} ]</value>
@@ -264,7 +264,7 @@
         <value xml:lang="en">Caught generic service exception while getting 
order Id </value>
         <value xml:lang="fr">Erreur générique de service lors de 
l'acquisition de la réf. de commande </value>
         <value 
xml:lang="ja">注文の取得中にサービス例外が発生しました。ID 
</value>
-        <value xml:lang="nl">Er is een algemene service uitzondering 
opgetreden tijdens het ophalen van de bestelling ID </value>
+        <value xml:lang="nl">Er is een algemene service uitzondering 
opgetreden tijdens het ophalen van de order ID </value>
         <value xml:lang="pt-BR">Exceção capturada em serviço genérico 
durante a obtenção do ID do pedido</value>
         <value xml:lang="vi">Lỗi xảy ra ở tầng dịch vụ ứng 
dụng khi lấy ID của đơn hàng</value>
         <value xml:lang="zh">获得订单æ 
‡è¯†æ—¶å‘生一般服务意外错误 </value>
@@ -328,7 +328,7 @@
         <value xml:lang="fr">Vous ne pouvez pas trouver l'en-tôte de la 
commande pour l'identifiant de commande [ ${orderId} ] dans l'obtention du 
magasin pour les articles de la commande, le retour étant nul</value>
         <value xml:lang="it">Non è possibile trovare OrderHeader per orderId 
[ ${orderId} ] in getProductStoreFromOrder, restituito null</value>
         <value xml:lang="ja">getProductStoreFromOrderで、注文ID [ 
${orderId} ] 
に対する注文ヘッダが見つかりません。空を戻します</value>
-        <value xml:lang="nl">Kan de bestellingkop niet vinden voor bestelling 
ID [ ${orderId} ] in service getProductStoreFromOrder, respons is leeg</value>
+        <value xml:lang="nl">Kan de orderkop niet vinden voor order ID [ 
${orderId} ] in service getProductStoreFromOrder, respons is leeg</value>
         <value xml:lang="pt-BR">Não foi possível encontrar o cabeçalho do 
pedido de ID [ ${orderId} ] em in getProductStoreFromOrder, returning 
null</value>
         <value xml:lang="ro">Nu este posibila gasirea OrderHeader pentru 
orderId [ ${orderId} ] in getProductStoreFromOrder, returnat nul</value>
         <value xml:lang="ru">Невозможно найти OrderHeader 
для orderId [ ${orderId} ] в getProductStoreFromOrder, 
возвращается пустое значение</value>
@@ -408,7 +408,7 @@
         <value xml:lang="fr">Impossible d'initialiser un ordre d'achat 
vide</value>
         <value xml:lang="it">Non è possibile inizializzare un'ordine di 
acquisto vuoto.</value>
         <value 
xml:lang="ja">購買注文が空のため初期化できません</value>
-        <value xml:lang="nl">Kan een lege inkoopbestelling niet 
initialiseren.</value>
+        <value xml:lang="nl">Kan een lege inkooporder niet 
initialiseren.</value>
         <value xml:lang="pt-BR">Não foi possível iniciar um pedido de compra 
vazio</value>
         <value xml:lang="ru">Невозможно 
инициализировать пустой закупочный 
заказ.</value>
         <value 
xml:lang="th">ไม่สามารถเริ่มดำเนินการรายการสั่งซื้อว่าง</value>
@@ -571,7 +571,7 @@
         <value xml:lang="en">ERROR: All items of order #${orderId} are already 
verified</value>
         <value xml:lang="fr">ERREUR : Toutes les lignes de la commande 
${orderId} sont déjà vérifiées</value>
         <value xml:lang="ja">エラー: 注文No ${orderId} のアイテム
はすべて確認済です</value>
-        <value xml:lang="nl">Fout: Alle regels van de bestelling met nummer 
#${orderId} zijn al gevalideerd</value>
+        <value xml:lang="nl">Fout: Alle regels van de order met nummer 
#${orderId} zijn al gevalideerd</value>
         <value xml:lang="pt-BR">ERRO: Todos os itens do pedido #${orderId} já 
foram verificados</value>
         <value xml:lang="vi">Lỗi xảy ra: Tất cả hạng mục hàng 
hóa trong đơn hàng #${orderId} đã được thẩm định</value>
         <value xml:lang="zh">错误：已经验证了订单#${orderId}的å…
¨éƒ¨æ˜Žç»†</value>
@@ -581,7 +581,7 @@
         <value xml:lang="en">ERROR: Attempt to verify order #${orderId} 
failed</value>
         <value xml:lang="fr">ERREUR : La vérification de la commande 
${orderId} a échoué</value>
         <value xml:lang="ja">エラー: 注文No ${orderId} 
の確認に失敗しました</value>
-        <value xml:lang="nl">Fout Poging om bestelling met nummer #${orderId} 
te controleren is mislukt</value>
+        <value xml:lang="nl">Fout Poging om order met nummer #${orderId} te 
controleren is mislukt</value>
         <value xml:lang="pt-BR">ERRO: Tentativa de verificar pedido 
#${orderId} falhou</value>
         <value xml:lang="vi">Lỗi xảy ra: Quá trình thẩm định đơn 
hàng #${orderId} không thành công</value>
         <value xml:lang="zh">错误：验证订单#${orderId}时失败</value>
@@ -704,7 +704,7 @@
         <value xml:lang="fr">Erreur : Ne peut pas obtenir l'entité de 
l'en-tête de la commande : </value>
         <value xml:lang="it">ERRORE : Non è possibile ottenere entità 
OrderHeader : </value>
         <value xml:lang="ja">エラー: 
注文ヘッダエンティティが取得できません: </value>
-        <value xml:lang="nl">Fout : Kan de bestellingkop tabel niet ophalen : 
</value>
+        <value xml:lang="nl">Fout : Kan de orderkop tabel niet ophalen : 
</value>
         <value xml:lang="pt-BR">ERRO : Não foi possível obter cabeçalho do 
produto :</value>
         <value xml:lang="ro">EROARE : Nu este posibila obtinerea entitatii 
OrderHeader : </value>
         <value xml:lang="ru">ОШИБКА: Невозможно 
получить объект OrderHeader: </value>
@@ -720,7 +720,7 @@
         <value xml:lang="fr">Erreur : impossible d'obtenir l'entité 
d'association des articles de la commande ${itemMsgInfo}</value>
         <value xml:lang="it">ERRORE : Non è possibile ottenere entità 
OrderItem Assoc : ${itemMsgInfo}</value>
         <value xml:lang="ja">エラー: 注文アイテム
関連付けエンティティが取得できません: ${itemMsgInfo}</value>
-        <value xml:lang="nl">Fout : Kan de bestellingregel associatie tabel 
niet ophalen : ${itemMsgInfo}</value>
+        <value xml:lang="nl">Fout : Kan de orderregel associatie tabel niet 
ophalen : ${itemMsgInfo}</value>
         <value xml:lang="pt-BR">Não foi possível obter OrderItem associado a 
entity : ${itemMsgInfo}</value>
         <value xml:lang="ro">EROARE : Nu este posibila obtinerea entitatii 
OrderItem Assoc : ${itemMsgInfo}</value>
         <value xml:lang="ru">ОШИБКА: Невозможно 
получить объект OrderItem Assoc: ${itemMsgInfo}</value>
@@ -736,7 +736,7 @@
         <value xml:lang="fr">Erreur : impossible d'obtenir l'entité des 
articles de la commande : </value>
         <value xml:lang="it">ERRORE: Non è possibile ottenere entità 
OrderItem :</value>
         <value xml:lang="ja">エラー: 注文アイテム
エンティティが取得できません: </value>
-        <value xml:lang="nl">Fout : Kan de bestellingregel tabel niet ophalen 
: </value>
+        <value xml:lang="nl">Fout : Kan de orderregel tabel niet ophalen : 
</value>
         <value xml:lang="pt-BR">ERRO: Não foi possível ler entity do 
OrderItem: </value>
         <value xml:lang="ro">EROARE: Nu este posibila obtinerea entitatii 
OrderItem :</value>
         <value xml:lang="ru">ОШИБКА: Невозможно 
получить объект OrderItem:</value>
@@ -752,7 +752,7 @@
         <value xml:lang="fr">Erreur : impossible d'obtenir l'entité du rôle 
de la commande ${itemMsgInfo}</value>
         <value xml:lang="it">ERRORE : Non è possibile ottenere entità 
OrderRole : ${itemMsgInfo}</value>
         <value xml:lang="ja">エラー: 
注文ロールエンティティが取得できません: 
${itemMsgInfo}</value>
-        <value xml:lang="nl">Fout : Kan de bestellingrol tabel niet ophalen : 
${itemMsgInfo}</value>
+        <value xml:lang="nl">Fout : Kan de oderrol tabel niet ophalen : 
${itemMsgInfo}</value>
         <value xml:lang="pt-BR">ERRO : Não foi possível ler entity de 
OrderRole : ${itemMsgInfo}</value>
         <value xml:lang="ro">EROARE : Nu este posibila obtinerea entitatii 
OrderRole : ${itemMsgInfo}</value>
         <value xml:lang="ru">ОШИБКА: Невозможно 
получить объект OrderRole: ${itemMsgInfo}</value>

Reply via email to