Keeps in sync with OFBiz trunk HEAD

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23@1654682 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/applications/accounting/widget/FixedAssetForms.xml b/applications/accounting/widget/FixedAssetForms.xml
index 3510777..6766883 100644
--- a/applications/accounting/widget/FixedAssetForms.xml
+++ b/applications/accounting/widget/FixedAssetForms.xml
@@ -21,7 +21,7 @@
 <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 @@
         <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">
diff --git a/applications/accounting/widget/FixedAssetScreens.xml b/applications/accounting/widget/FixedAssetScreens.xml
index 5647716..2a8b358 100644
--- a/applications/accounting/widget/FixedAssetScreens.xml
+++ b/applications/accounting/widget/FixedAssetScreens.xml
@@ -68,7 +68,7 @@
                 <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>
diff --git a/applications/content/widget/layout/LayoutForms.xml b/applications/content/widget/layout/LayoutForms.xml
index 33f20b6..f78bf80 100644
--- a/applications/content/widget/layout/LayoutForms.xml
+++ b/applications/content/widget/layout/LayoutForms.xml
@@ -37,13 +37,13 @@
             <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/>
diff --git a/applications/humanres/data/HumanResHelpData.xml b/applications/humanres/data/HumanResHelpData.xml
index fad387a..6d86c5e 100644
--- a/applications/humanres/data/HumanResHelpData.xml
+++ b/applications/humanres/data/HumanResHelpData.xml
@@ -29,8 +29,87 @@
         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"/>
diff --git a/applications/humanres/data/helpdata/HELP_HR.xml b/applications/humanres/data/helpdata/HELP_HR.xml
index 6a760a8..c280a1f 100644
--- a/applications/humanres/data/helpdata/HELP_HR.xml
+++ b/applications/humanres/data/helpdata/HELP_HR.xml
@@ -22,5 +22,44 @@
   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>
diff --git a/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml b/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml
new file mode 100644
index 0000000..be6adf6
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Create or Edit Employee Position</title>
+
+    <para>This screen is used to create or edit and update an employee position.</para>
+    <para>The main search screen it is opened in create mode by clicking the New Employee
+        Position button or in update mode by clicking on the EmployeePosition Id
+        column in Search Results.</para>
+
+       <para>Fields</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>Employee Position Id - Unique Id for the position. May be
+            user entered or if empty the system will generate sequence
+            number.</para>
+          </listitem>
+
+          <listitem>
+            <para>Status ID - One of Active/Open, Inactive/Closed or Planned
+            For.</para>
+          </listitem>
+
+          <listitem>
+            <para>Party Id - The party id of the
+            internal organization authorized to fill the
+            position.</para>
+          </listitem>
+
+          <listitem>
+            <para>Budget Id - A user entered identifier for the budget
+            authorizing the position.</para>
+          </listitem>
+
+          <listitem>
+            <para>Budget Item Seq Id - A user entered identifier for the
+            budget item authorizing the position.</para>
+          </listitem>
+
+          <listitem>
+            <para>Empl Position Type Id - Select a name for the position type.
+            Position types are defined in Global HR Settings
+            .</para>
+          </listitem>
+
+          <listitem>
+            <para>Estimated From Date - Enter date the position is expected to
+            be filled.</para>
+          </listitem>
+
+          <listitem>
+            <para>Estimated Thru Date - Enter date on which the positions
+            budget authorization is expected to end.</para>
+          </listitem>
+
+          <listitem>
+            <para>Salary Flag - Enter Y if this is a salaried position else
+            N.</para>
+          </listitem>
+
+          <listitem>
+            <para>Exempt Flag - Enter Y if this position exempt from a
+            requirement else N</para>
+          </listitem>
+
+          <listitem>
+            <para>Fulltime Flag - Enter Y if this is a fulltime position else
+            N</para>
+          </listitem>
+
+          <listitem>
+            <para>Temporary Flag - Enter Y if this is a temporary position
+            else N</para>
+          </listitem>
+
+          <listitem>
+            <para>Actual From Date - Enter the date the position is
+            filled.</para>
+          </listitem>
+
+          <listitem>
+            <para>Actual Thru Date - Enter the date the position is no longer
+            authorized.</para>
+          </listitem>
+        </itemizedlist>
+
+        <para>Click Create - to create the position.</para>
+    
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml b/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml
new file mode 100644
index 0000000..232dca1
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Employee Leave</title>
+
+ <para>This screen is displays any leave requested by an employee.</para>
+     
+      <para>Any user with Human Resource Employee permission can view and
+      request leave for any other employee. </para>
+      
+      <para>NOTE: Only users with Human Resource
+      Approver permission can update or approve a leave request.</para>
+
+      <para>Leave requests are managed in the 'Leave' menu option where in addition
+      to requesting leave, an approver may review and approve any requests
+      assigned to them.</para>
+      
+      <para>NOTE:Leave types and reasons are managed by the administrator in the
+      Global HR Settings.</para>
+        
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml b/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml
new file mode 100644
index 0000000..c35d383
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Employee Qualifications</title>
+  
+  <para>In this screen you can enter details of any qualifications an employee has, to a person
+      which could help track their ability to perform a particular job.</para>
+
+      <para>Existing qualifications can also be updated and status codes can be used  
+      to help manage the process of verifying the validity of any qualifications entered.</para>
+    
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml b/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml
new file mode 100644
index 0000000..7dd83e0
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Employee Skills</title>
+
+   <para>In this screen you can assign a skill to an employee. 
+   		Enter numeric values in 'Years Experience', 'Rating' and 'Skill Level' to provide
+		objective criteria for managing resources with the same skill.</para>
+	
+		<para>These attributes can be used to locate
+      resources with a needed skill.</para>
+
+      <para>NOTE:Skills are managed in 'Global HR Settings' where new skill groups and skills
+      can be created or existing ones can be amended.</para>
+    
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml b/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml
new file mode 100644
index 0000000..f3b0af1
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Employee Training</title>
+
+   <para>This screen lists any training for an employee. Details such as the
+   type of training, date, time and also the person who needs to approve
+   the training are displayed</para>
+  
+      <para>NOTE: You cannot enter any training details in this screen. If you
+      need to enter training for an employee it can be done under the 'Training' 
+      menu option.</para>
+
+          
+    
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml b/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml
new file mode 100644
index 0000000..6ccd557
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Create or Edit Employment</title>
+
+   <para>This screen allows you to create a new employment or edit an existing
+   one.</para>
+   <para>To create a new employment relationship between Company and an employee</para>
+   <itemizedlist>
+   		<listitem><para>Select the Employee Party Id</para></listitem>
+     	<listitem><para>Enter the start date for the employment (e.g. Hire Date)</para></listitem>
+  		<listitem><para>Click Create</para></listitem>
+  </itemizedlist>
+  
+  <para>Once created the employment detail screen will be displayed where you can update
+  a range of information related to the employment such as benefits, payment preferences
+  and unemployment claims</para>
+        
+    
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml b/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml
new file mode 100644
index 0000000..84d0501
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>View Employee Position</title>
+
+  <para>This screen displays summary details about an Employee Position including
+  details about who currently holds the position, their responsibilities and 
+  the reporting structure.</para> 
+    
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml b/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml
new file mode 100644
index 0000000..e9d2233
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Employee Profile</title>
+ 
+ 	<para>The Profile screen for an employee is a collection of screenlets
+      each displaying information about a different aspect of the employee.</para>
+
+      <para>In this screen you can:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>View summary information about an employee</para>
+        </listitem>
+
+        <listitem>
+          <para>Update employee personal information</para>
+        </listitem>
+
+        <listitem>
+          <para>View, create, update, and expire employee contact
+          information</para>
+        </listitem>
+
+        <listitem>
+          <para>View and create a list of related accounts</para>
+        </listitem>
+
+        <listitem>
+          <para>View training records</para>
+        </listitem>
+
+        <listitem>
+          <para>View employment information</para>
+        </listitem>
+
+        <listitem>
+          <para>View, create, and update login id's, update security
+          group</para>
+        </listitem>
+
+        <listitem>
+          <para>View and create party attributes</para>
+        </listitem>
+
+        <listitem>
+          <para>Upload party content</para>
+        </listitem>
+
+        <listitem>
+          <para>View and create notes</para>
+        </listitem>
+      </itemizedlist>
+    
+    
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml b/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml
new file mode 100644
index 0000000..89e68f7
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Find Employee Positions</title>
+
+	<para>An Employee Position is the authorization, typically from the budget of an 
+	internal organization,for the Company to engage someone to do a job. </para>
+
+    <para>This means that you can fill a position in a number
+    of different ways. </para>
+   
+    <para>You can fill a position with one full time person, change the assignment of 
+    a position from one person to another over time, or split a position across
+    more then one person at the same a time.</para>
+   
+    <para>Positions have a status. They can be one of: Planned For,
+    Active/Open, or Inactive/Closed.</para>
+
+    <para>Positions have a type, defined in Global HR Settings, which
+    describes the job and its pay rates. Some examples of job types could be
+    secretary, production worker, sales manager, executive vice president or
+    OFBiz programmer.</para>
+    <para> If more then one person is needed for a type of job then
+    a position must be created for each required person i.e. If 10 secretaries
+    are authorized for the Human Resource department then 10 positions are
+    created with type secretary.</para>
+
+    <para>Positions have a reporting structure and report to other
+    positions (and not the people who hold the position). </para>
+    <para>You can identify the
+    position a position reports to and/or the positions(s) a position
+    manages.</para>
+
+    
+      <para>NOTE: Be careful because it is possible to create circular reporting
+      structures.</para>
+    
+       
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml b/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml
new file mode 100644
index 0000000..ea48979
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Employments</title>
+
+    <para>An employment is a relationship between a person and your Company.
+    The Human Resources application tracks employment benefits, pay history, unemployment claims
+    and employment agreements for each employed person.</para>
+
+    <para>When you create new employee, an employee relationship is created
+    automatically. </para>
+    <para> NOTE: If a person was entered into the application by some other means 
+    then you will have to create the employee relationship manually in the Party Manager
+    application.</para>
+
+    <para>The employment record includes the start and end date of the
+    employment. When the employment ends you include the type of termination
+    and a reason. </para>
+    <para>For example, an employee may have been let go because of poor
+    performance. (In this case the 'type' could be 'fired and the reason could be 'poor performance')</para>
+  
+    <para>The Employments screen can be used to create an employment or search for existing
+      employments.</para>
+    
+
+ </section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml b/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml
new file mode 100644
index 0000000..16626b4
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>List Employee Position</title>
+
+    <para>This screen displays a list of positions for an employee.</para>
+    <para>NOTE: Employee positions are created and managed in the 'Employee Position' menu option.</para>
+    <para>Details about the position are displayed including any related dates and 
+    whether the position is temporary or not.</para>
+   
+    
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml b/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml
new file mode 100644
index 0000000..8cec311
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>List Employments</title>
+
+     <para>This screen displays a list of Employments for an employee.</para>
+     <para>NOTE:Usually a person will have only a single employment with an employer.</para>
+      
+      <para>The employment details (e.g benefits, payroll preferences, etc)
+       can be modified by clicking 'Edit'.</para>
+  
+ </section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml b/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml
new file mode 100644
index 0000000..ca6b80f
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Create New Employee</title>
+
+    <para>This screen allows you to create a new employee.</para>
+    <para>There are some mandatory fields required and these are indicated
+    on the screen</para>
+    <para>To create a new employee</para>
+    <itemizedlist>
+        <listitem><para>Click New Employee</para></listitem>
+        <listitem><para>Enter the Employee details (e.g Name, Organization, Address, Phone Number)</para></listitem>
+        <listitem><para>Click Save</para></listitem>   
+    </itemizedlist>
+    <para>The new employee will be created</para>
+    
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml b/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml
new file mode 100644
index 0000000..e4bcc97
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Payroll History</title>
+
+    <para>This screen displays a list of invoices for the employee. Generally these are
+      payroll or commission invoices. </para>
+      <para>NOTE:An employee payslip is the same as an OFBiz payroll invoice</para>
+     
+      <para>The invoice life cycle from creation
+      through payment is done in the Accounting application.</para>
+
+      <para>Fields</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Invoice ID - The distance identifier of the invoice. This
+          number can be used to find the invoice in the Accounting
+          application.</para>
+        </listitem>
+
+        <listitem>
+          <para>Invoice Type - Identifies the type of invoice. This will
+          typically be Payroll.</para>
+        </listitem>
+
+        <listitem>
+          <para>Invoice Date - Date the invoice was created.</para>
+        </listitem>
+
+        <listitem>
+          <para>Invoice Status - Status may be In-Processes (can be edited),
+          Approved (has been reviewed, can not be edited), Ready (post to GL),
+          Paid (post to GL)</para>
+        </listitem>
+
+        <listitem>
+          <para>Description - A user entered description of the
+          invoice.</para>
+        </listitem>
+
+        <listitem>
+          <para>From Party - The employee identified by the party id . The invoice is in effect from
+          the employee to the company.</para>
+        </listitem>
+
+        <listitem>
+          <para>To Party - The party the invoice is to. For payroll this will
+          typically by your company identified by the party id.</para>
+        </listitem>
+
+        <listitem>
+          <para>Total - Amount paid. For a payroll invoice this will typically
+          be less then the gross amount of the invoice due to deductions for
+          taxes and benefits etc</para>
+        </listitem>
+
+        <listitem>
+          <para>Outstanding Amount - Any unpaid amount due on the
+          invoice.</para>
+        </listitem>
+      </itemizedlist>
+  
+ </section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml b/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml
new file mode 100644
index 0000000..41f7498
--- /dev/null
+++ b/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+  xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+  xmlns="http://docbook.org/ns/docbook">
+ 
+  <title>Find Employees</title>
+
+    <para>The Employees feature manages information about people who have an
+    employment relationship with your Company or one of its departments. This includes an
+    employee profile, a display of all employee related information in a single screen and facilities for
+    managing employee skills, qualifications, training, leave and payroll history</para>
+    
+    <para>In this screen you can create a new employee, search for an 
+     existing employee and view a list of employees.</para>
+     
+    <para>Selecting an employee in the list opens the employee's profile and 
+     other screens associated with the employee.</para>
+          
+     <para>To find an employee enter the search criteria.</para>
+
+        <para>NOTE: Only Employees Are Found.If you want to locate people who are 
+        not employees then use the Party Manager application.</para>
+
+       <para>Fields</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>Party ID - Must be the id of a party who is an
+            employee.</para>
+          </listitem>
+
+          <listitem>
+            <para>User Login - The identifier used to login to OFBiz. 
+            An employee may have zero or more user logins.</para>
+          
+          </listitem>
+
+          <listitem>
+            <para>Last name - Employee last name</para>
+          </listitem>
+
+          <listitem>
+            <para>First name - Employee first name</para>
+          </listitem>
+        </itemizedlist>
+
+         
+</section>
diff --git a/applications/humanres/data/helpdata/HELP_HR_main.xml b/applications/humanres/data/helpdata/HELP_HR_main.xml
index b094789..f15faec 100644
--- a/applications/humanres/data/helpdata/HELP_HR_main.xml
+++ b/applications/humanres/data/helpdata/HELP_HR_main.xml
@@ -22,11 +22,50 @@
   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>
diff --git a/applications/manufacturing/config/ManufacturingEntityLabels.xml b/applications/manufacturing/config/ManufacturingEntityLabels.xml
index 79811ea..2d381c1 100644
--- a/applications/manufacturing/config/ManufacturingEntityLabels.xml
+++ b/applications/manufacturing/config/ManufacturingEntityLabels.xml
@@ -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>
diff --git a/applications/order/config/OrderErrorUiLabels.xml b/applications/order/config/OrderErrorUiLabels.xml
index 987117d..4fd5c6d 100644
--- a/applications/order/config/OrderErrorUiLabels.xml
+++ b/applications/order/config/OrderErrorUiLabels.xml
@@ -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>
diff --git a/applications/order/config/OrderUiLabels.xml b/applications/order/config/OrderUiLabels.xml
index 614f734..58ff225 100644
--- a/applications/order/config/OrderUiLabels.xml
+++ b/applications/order/config/OrderUiLabels.xml
@@ -25,7 +25,7 @@
         <value xml:lang="fr">Ajouter une note</value>
         <value xml:lang="it">Aggiungi nota</value>
         <value xml:lang="ja">連絡を追加</value>
-        <value xml:lang="nl">Toegevoegde opmerking aan bestelling: </value>
+        <value xml:lang="nl">Toegevoegde opmerking aan order: </value>
         <value xml:lang="pt-BR">Adicionar uma nota</value>
         <value xml:lang="vi">Thêm ghi chú</value>
         <value xml:lang="zh">添加便笺</value>
@@ -402,7 +402,7 @@
         <value xml:lang="fr">Réf. de premier essai de commande</value>
         <value xml:lang="it">Primo Tentativo Numero Ordine</value>
         <value xml:lang="ja">初回試行注文ID</value>
-        <value xml:lang="nl">Bestelling ID eerste poging</value>
+        <value xml:lang="nl">Order ID eerste poging</value>
         <value xml:lang="pt-BR">ID da primeira tentativa de pedido</value>
         <value xml:lang="ro">Prima Tentativa Numar Comanda</value>
         <value xml:lang="ru">Код первого заказа</value>
@@ -509,7 +509,7 @@
         <value xml:lang="fr">Est une commande "rush"</value>
         <value xml:lang="it">E' un'Ordine Rush</value>
         <value xml:lang="ja">至急注文</value>
-        <value xml:lang="nl">Spoedbestelling</value>
+        <value xml:lang="nl">Spoedorder</value>
         <value xml:lang="pt-BR">É um pedido marcado com urgência</value>
         <value xml:lang="ro">Este o Comanda Rush</value>
         <value xml:lang="ru">Срочный заказ?</value>
@@ -541,7 +541,7 @@
         <value xml:lang="fr">Date de dernière commande</value>
         <value xml:lang="it">Ultima Data Ordine</value>
         <value xml:lang="ja">最新注文日</value>
-        <value xml:lang="nl">Laatste bestellingdatum</value>
+        <value xml:lang="nl">Laatste orderdatum</value>
         <value xml:lang="pt-BR">Última data de pedido</value>
         <value xml:lang="ro">Ultima Data Comanda</value>
         <value xml:lang="ru">Дата последнего заказа</value>
@@ -683,7 +683,7 @@
         <value xml:lang="fr">Réf. d'entête de commande</value>
         <value xml:lang="it">Numero Testata Ordine</value>
         <value xml:lang="ja">注文ヘッダID</value>
-        <value xml:lang="nl">Bestelling briefhoofd ID</value>
+        <value xml:lang="nl">Order briefhoofd ID</value>
         <value xml:lang="pt-BR">ID do cabeçalho do pedido</value>
         <value xml:lang="ro">Numar Antet Comanda</value>
         <value xml:lang="ru">Код оглавления заказа</value>
@@ -700,7 +700,7 @@
         <value xml:lang="fr">Réf. de commande</value>
         <value xml:lang="it">Numero Ordine</value>
         <value xml:lang="ja">注文ID</value>
-        <value xml:lang="nl">Bestelling ID</value>
+        <value xml:lang="nl">Order ID</value>
         <value xml:lang="pt-BR">ID do pedido</value>
         <value xml:lang="ro">Numar Comanda</value>
         <value xml:lang="ru">Код заказа</value>
@@ -732,7 +732,7 @@
         <value xml:lang="fr">Nom de commande</value>
         <value xml:lang="it">Nome Ordine</value>
         <value xml:lang="ja">注文名称</value>
-        <value xml:lang="nl">Bestellingnaam</value>
+        <value xml:lang="nl">Ordernaam</value>
         <value xml:lang="pt-BR">Nome do pedido</value>
         <value xml:lang="th">ชื่อรายการสั่งซื้อสินค้า</value>
         <value xml:lang="vi">Tên</value>
@@ -746,7 +746,7 @@
         <value xml:lang="fr">Réf. status de commande</value>
         <value xml:lang="it">Stato Ordine</value>
         <value xml:lang="ja">注文ステータスID</value>
-        <value xml:lang="nl">ID Bestellingstatus</value>
+        <value xml:lang="nl">ID Orderstatus</value>
         <value xml:lang="pt-BR">ID do estado do pedido</value>
         <value xml:lang="ro">Stare Comanda</value>
         <value xml:lang="ru">Код статуса заказа</value>
@@ -762,7 +762,7 @@
         <value xml:lang="fr">Réf. de type de commande</value>
         <value xml:lang="it">Tipo Ordine</value>
         <value xml:lang="ja">注文種類ID</value>
-        <value xml:lang="nl">ID bestellingsoort</value>
+        <value xml:lang="nl">ID Ordersoort</value>
         <value xml:lang="pt-BR">ID do tipo de pedido</value>
         <value xml:lang="ro">Tip Comanda</value>
         <value xml:lang="ru">Код типа заказа</value>
@@ -778,7 +778,7 @@
         <value xml:lang="fr">Lien vers les commandes</value>
         <value xml:lang="it">Link Ordini</value>
         <value xml:lang="ja">注文リンク</value>
-        <value xml:lang="nl">link naar bestellingen</value>
+        <value xml:lang="nl">link naar orders</value>
         <value xml:lang="pt-BR">Link para pedidos</value>
         <value xml:lang="ro">Link Comenzi</value>
         <value xml:lang="ru">Связь с заказами</value>
@@ -1120,6 +1120,10 @@
         <value xml:lang="zh">退货头类型标识</value>
         <value xml:lang="zh-TW">退貨標頭類型識別</value>
     </property>
+    <property key="FormFieldTitle_returnItemSeqId">
+        <value xml:lang="en">Return Item Seq Id</value>
+        <value xml:lang="nl">Retour Itemnr Id</value>
+    </property>
     <property key="FormFieldTitle_salesChannelEnumId">
         <value xml:lang="de">Verkaufskanal Id</value>
         <value xml:lang="en">Sales Channel Enum Id</value>
@@ -1769,7 +1773,7 @@
         <value xml:lang="fr">Ajouter à la commande</value>
         <value xml:lang="it">Aggiungi All'Ordine</value>
         <value xml:lang="ja">注文に追加</value>
-        <value xml:lang="nl">Aan bestelling toevoegen</value>
+        <value xml:lang="nl">Aan order toevoegen</value>
         <value xml:lang="pt-BR">Adicionar ao pedido</value>
         <value xml:lang="ro">Adauga la Comanda </value>
         <value xml:lang="ru">Добавить в заказ</value>
@@ -1908,7 +1912,7 @@
         <value xml:lang="fr">Agent de commande</value>
         <value xml:lang="it">Agente Ordine</value>
         <value xml:lang="ja">注文エージェント</value>
-        <value xml:lang="nl">Bestelling-agent</value>
+        <value xml:lang="nl">Order-agent</value>
         <value xml:lang="pt-BR">Encarregado do pedido</value>
         <value xml:lang="ro">Agent Comanda </value>
         <value xml:lang="ru">Агент заказа</value>
@@ -2048,7 +2052,7 @@
         <value xml:lang="hi-IN">कोईभी आदेश स्थिति</value>
         <value xml:lang="it">Qualsiasi stato ordine</value>
         <value xml:lang="ja">任意の注文ステータス</value>
-        <value xml:lang="nl">Elke bestellingstatus</value>
+        <value xml:lang="nl">Elke orderstatus</value>
         <value xml:lang="pt">Qualquer Estado de Encomenda</value>
         <value xml:lang="pt-BR">Qualquer estado de pedido</value>
         <value xml:lang="ro">Orice Stadiu Comanda</value>
@@ -2068,7 +2072,7 @@
         <value xml:lang="hi-IN">कोईभी आदेश के प्रकार</value>
         <value xml:lang="it">Qualsiasi tipo ordine</value>
         <value xml:lang="ja">任意の注文種類</value>
-        <value xml:lang="nl">Elk bestellingstype</value>
+        <value xml:lang="nl">Elk orderstype</value>
         <value xml:lang="pt">Qualquer Tipo de Encomenda</value>
         <value xml:lang="pt-BR">Qualquer tipo de pedido</value>
         <value xml:lang="ro">Orice Tip de Comanda</value>
@@ -2086,7 +2090,7 @@
         <value xml:lang="fr">Approuver la commande</value>
         <value xml:lang="it">Approva Ordine(i)</value>
         <value xml:lang="ja">注文を承認</value>
-        <value xml:lang="nl">Bevestig bestelling</value>
+        <value xml:lang="nl">Bevestig order</value>
         <value xml:lang="pt-BR">Aprovar pedido</value>
         <value xml:lang="ro">Aprobare Comanda(enzi)</value>
         <value xml:lang="ru">Утвердить заказ</value>
@@ -2312,7 +2316,7 @@
         <value xml:lang="hi-IN">आर्डर सम्मिमित करना न भूलें #</value>
         <value xml:lang="it">Assicurati di specificare il n° del tuo ordine</value>
         <value xml:lang="ja">注文に含まれていることを確認</value>
-        <value xml:lang="nl">Bestelling bijgesloten?</value>
+        <value xml:lang="nl">Order bijgesloten?</value>
         <value xml:lang="pt-BR">Certifique-se de incluir seu pedido</value>
         <value xml:lang="pt-PT">Certifique-se que incluiu o número da sua encomenda</value>
         <value xml:lang="ro">Asigurate ca ai inclus Comanda ta </value>
@@ -2466,7 +2470,7 @@
         <value xml:lang="fr">Annuler la commande</value>
         <value xml:lang="it">Annulla ordine</value>
         <value xml:lang="ja">注文を取消</value>
-        <value xml:lang="nl">Bestelling annuleren</value>
+        <value xml:lang="nl">Order annuleren</value>
         <value xml:lang="pt-BR">Cancelar pedido</value>
         <value xml:lang="th">ยกเลิกรายการสั่งซื้อ</value>
         <value xml:lang="vi">Hủy đặt hàng</value>
@@ -2528,7 +2532,7 @@
         <value xml:lang="fr">(Ne peut être modifié sans réinitialiser la commande.)</value>
         <value xml:lang="it">(Non è possibile cambiarlo senza annullare l'ordine.)</value>
         <value xml:lang="ja">(変更できません、注文をクリアしてください)</value>
-        <value xml:lang="nl">(kan niet worden gewijzigd zonder de reeds opgestartte bestelling op te ruimen.)</value>
+        <value xml:lang="nl">(kan niet worden gewijzigd zonder de reeds opgestartte order op te ruimen.)</value>
         <value xml:lang="pt-BR">(não é possível alterar sem limpar o pedido.)</value>
         <value xml:lang="ro">(Nu este posibila schimbarea fara stergerea comenzii.)</value>
         <value xml:lang="ru">(нельзя изменить без очистки заказа.)</value>
@@ -2803,7 +2807,7 @@
         <value xml:lang="fr">Réinitialisation</value>
         <value xml:lang="it">Annulla Ordine</value>
         <value xml:lang="ja">注文をクリア</value>
-        <value xml:lang="nl">Bestelling wissen</value>
+        <value xml:lang="nl">Order wissen</value>
         <value xml:lang="pt-BR">Limpar pedido</value>
         <value xml:lang="ru">Очистить</value>
         <value xml:lang="th">เคลียร์รายการสั่งซื้อสินค้า</value>
@@ -2855,7 +2859,7 @@
         <value xml:lang="hi-IN">कोमा (,) के अलग करके आप अपना एक से ज्यादा ईमेल पता डाल सकते हैं, जिस तरह से आपने डाला है उस तरह से उपयोग होगा</value>
         <value xml:lang="it">Puoi aggiungere altri indirizzi email separati da virgola qui, saranno usati solamente per l'ordine attuale</value>
         <value xml:lang="ja">カンマ区切りで別のEメールアドレスを追加できます。このEメールアドレスは現在の注文でのみ有効です。</value>
-        <value xml:lang="nl">U mag een aantal emailadressen hier toevoegen (gescheiden door een comma) die alleen voor de huidige bestelling worden gebruikt</value>
+        <value xml:lang="nl">U mag een aantal emailadressen hier toevoegen (gescheiden door een comma) die alleen voor de huidige order worden gebruikt</value>
         <value xml:lang="pt-BR">Você pode adicionar outros endereços de email separados por vírgulas aqui. Eles serão utilizados apenas para o pedido atual</value>
         <value xml:lang="pt-PT">Você pode adicionar outros endereços de e-mail, separados por vírgulas, utilizados apenas para esta encomenda</value>
         <value xml:lang="ro">Tu poti sa adaugi aici alte adrese email separate de virgula, care vor fi uzate numai pentru comanda actuala</value>
@@ -2872,7 +2876,7 @@
         <value xml:lang="fr">OFBiz : Gestion commerciale</value>
         <value xml:lang="it">OFBiz: Gestione ordini</value>
         <value xml:lang="ja">OFBiz: 注文管理</value>
-        <value xml:lang="nl">OFBiz: Bestelling Manager</value>
+        <value xml:lang="nl">OFBiz: Order Manager</value>
         <value xml:lang="pt-BR">OFBiz: Gestão de Pedidos</value>
         <value xml:lang="ro">OFBiz: Gestiune Comanda </value>
         <value xml:lang="ru">OFBiz: Управление заказами</value>
@@ -2909,7 +2913,7 @@
         <value xml:lang="fr">Terminer la commande</value>
         <value xml:lang="it">Ordine Completato</value>
         <value xml:lang="ja">注文を完了</value>
-        <value xml:lang="nl">Bestelling afronden</value>
+        <value xml:lang="nl">Order afronden</value>
         <value xml:lang="pt-BR">Concluir pedido</value>
         <value xml:lang="ro">Ordin Completat</value>
         <value xml:lang="ru">Завершить заполнение заказа</value>
@@ -3022,7 +3026,7 @@
         <value xml:lang="fr">Passer à la vérification finale de la commande</value>
         <value xml:lang="it">Passa alla revisione finale ordine</value>
         <value xml:lang="ja">最終注文確認を続ける</value>
-        <value xml:lang="nl">Doorgaan naar bestellingoverzicht</value>
+        <value xml:lang="nl">Doorgaan naar orderoverzicht</value>
         <value xml:lang="pt-BR">Prosseguir para a revisão final do pedido</value>
         <value xml:lang="pt-PT">Continuar para a Revisão Final da Encomenda</value>
         <value xml:lang="ro">Continua Revizia Comenzii Finale</value>
@@ -3083,7 +3087,7 @@
         <value xml:lang="fr">Dupliquer cette commande</value>
         <value xml:lang="it">Creare Come Nuovo Ordine</value>
         <value xml:lang="ja">新規注文として作成</value>
-        <value xml:lang="nl">Als nieuwe bestelling aanmaken</value>
+        <value xml:lang="nl">Als nieuwe order aanmaken</value>
         <value xml:lang="pt-BR">Criar como um novo perdido</value>
         <value xml:lang="ru">Создать как новый заказ</value>
         <value xml:lang="th">สร้างรายการสั่งซื้อสินค้าใหม่</value>
@@ -3177,7 +3181,7 @@
         <value xml:lang="fr">Création de la commande</value>
         <value xml:lang="it">Creare Ordine</value>
         <value xml:lang="ja">注文を作成</value>
-        <value xml:lang="nl">Nieuw bestelling aanmaken</value>
+        <value xml:lang="nl">Nieuw order aanmaken</value>
         <value xml:lang="pt-BR">Criar pedido</value>
         <value xml:lang="ro">Creare Comanda</value>
         <value xml:lang="ru">Создать заказ</value>
@@ -3333,7 +3337,7 @@
         <value xml:lang="fr">Créer une nouveau devis depuis le panier</value>
         <value xml:lang="it">Crea un nuovo preventivo dal carrello</value>
         <value xml:lang="ja">買い物かごから新規見積を作成</value>
-        <value xml:lang="nl">maak een nieuwe offerte van deze bestelling</value>
+        <value xml:lang="nl">maak een nieuwe offerte van deze order</value>
         <value xml:lang="pt-BR">Criar nova cotação do carrinho</value>
         <value xml:lang="ro">Creare Nou Preventiv Din Cos</value>
         <value xml:lang="ru">Создать предложение из корзины</value>
@@ -3707,7 +3711,7 @@
         <value xml:lang="hi-IN">नोट: यह एअ डेमो साइट है</value>
         <value xml:lang="it">NOTA: Questo è un sito DIMOSTRATIVO. Gli ordini immessi NON saranno fatturati, e NON saranno evasi</value>
         <value xml:lang="ja">注意: これはデモ店舗です。ここでの注文は請求も実行されません。</value>
-        <value xml:lang="nl">OPMERKING: dit is een demonstratiewinkel. bestellingen die hier worden ingegeven worden niet uitgevoerd en worden niet gefactureerd.</value>
+        <value xml:lang="nl">OPMERKING: dit is een demonstratiewinkel. Orders die hier worden ingegeven worden niet uitgevoerd en worden niet gefactureerd.</value>
         <value xml:lang="pt-BR">OBS.: Essa é uma demonstração de frente de loja. Pedidos feitos aqui NÂO serão cobrados e não serão processados</value>
         <value xml:lang="pt-PT">NOTA: Isto é uma loja DEMONSTRAÇÃO. As encomendas colocadas aqui não serão processadas nem cobradas</value>
         <value xml:lang="ro">NOTA: Acesta este un un DEMO store-front. Comenzile aflate aici NU vor fi facturate, si NU vor fi satisfacute</value>
@@ -3926,7 +3930,7 @@
         <value xml:lang="hi-IN">चुना गया है  आपके आर्डर पर विचार कर आपको माल भेजने के बाद इमेल से सूचित किया जाएगा  आपके आर्डर के लिए धन्यवाद</value>
         <value xml:lang="it">è stato accettato. Il tuo ordine sarà processato, e riceverai un notifica email appena gli articoli saranno spediti.Grazie per averci preferito!</value>
         <value xml:lang="ja">は受付られました。注文が処理され、品物を発送する際にEメールでご連絡します。ご注文ありがとうございました。</value>
-        <value xml:lang="nl">is geaccepteerd. Uw bestelling zal worden uitgevoerd en een e-mail zal gestuurd worden wanneer de bestelling is verstuurd.Wij danken u voor uw bestelling!</value>
+        <value xml:lang="nl">is geaccepteerd. Uw order zal worden uitgevoerd en een e-mail zal gestuurd worden wanneer de order is verstuurd.Wij danken u voor uw order!</value>
         <value xml:lang="pt-BR">foi aceito. Seu pedido será processado, e você receberá uma notificação por email quando o item(ns) for(em) enviado(s). Muito Obrigado por seu pedido!</value>
         <value xml:lang="ro">A fost acceptat. Comanda ta va fi procesata, si vei primi o nota email dupa ce Linia(ile) au fost expediate.Iti Multumim pentru comenzile tale!</value>
         <value xml:lang="ru">подтвержден. Ваш заказ будет обработан и вы получите уведомление по электронной почте как только произойдет отгрузка.Спасибо за ваш заказ!</value>
@@ -3960,7 +3964,7 @@
         <value xml:lang="hi-IN">इस इमेल से आपको सूचित किया जाता है कि आर्डर का भुगतान #</value>
         <value xml:lang="it">Questa email è per informarti che per il tuo pagamento ordine n°</value>
         <value xml:lang="ja">このメールは次の注文に関する支払いのお知らせです。注文No</value>
-        <value xml:lang="nl">Deze e-mail is gestuurd om u te informeren dat de betaling voor bestelling #</value>
+        <value xml:lang="nl">Deze e-mail is gestuurd om u te informeren dat de betaling voor order #</value>
         <value xml:lang="pt-BR">Esse email serve para informá-lo que seu pagamento para o pedido #</value>
         <value xml:lang="ro">Acest email este pentru a te informa  ca plata comenzii #</value>
         <value xml:lang="ru">Это сообщение информирует вас что оплата заказа №</value>
@@ -3977,7 +3981,7 @@
         <value xml:lang="hi-IN">इस समय आपका आर्डर ख़ारीज किया जाता है, किसी प्रश्न के लिए ग्राहक सेवा से संपर्क किजीये</value>
         <value xml:lang="it">Il tuo ordine è stato annullato e non sarà processato. Per favore contatta l'assistenza clienti per qualsiasi informazione.</value>
         <value xml:lang="ja">あなたの注文は取り消され、処理されませんでした。なにかご質問がございましたら、カスタマサービスまでご連絡ください。</value>
-        <value xml:lang="nl">Uw bestelling is geannuleerd en zal niet worden uitgevoerd. Stel U in verbinding met de klantenservice als u vragen hebt.</value>
+        <value xml:lang="nl">Uw order is geannuleerd en zal niet worden uitgevoerd. Stel U in verbinding met de klantenservice als u vragen hebt.</value>
         <value xml:lang="pt-BR">Nesse momento seu pedido foi cancelado e não será processado. Por favor, entre em contato com o serviço ao cliente se você tiver alguma dúvida.</value>
         <value xml:lang="ro">In acest moment comanda ta a fost stearsa si nu va fi procesata. Te rugam contacteaza Serviciul Clienti pentru orice nelamurire.</value>
         <value xml:lang="ru">В данный момент ваш заказ отклонен и не будет обработан. Если у вас есть вопросы, пожалуйста, свяжитесь со службой поддержки пользователей.</value>
@@ -3994,7 +3998,7 @@
         <value xml:lang="hi-IN">इस इमेल से यह सूचित किया जाता है कि आपके आर्डर भुगतान मे समस्या है</value>
         <value xml:lang="it">Questa email è per informarti se c'è un problema con il tuo metodo di pagamento per l'ordine n°</value>
         <value xml:lang="ja">支払方法に問題がありましたので、メールにてお知らせさせていただきます。注文No</value>
-        <value xml:lang="nl">Deze email is U gestuurd om U ter informeren dat er een probleem was met uw betaling voor de bestelling #</value>
+        <value xml:lang="nl">Deze email is U gestuurd om U ter informeren dat er een probleem was met uw betaling voor de order #</value>
         <value xml:lang="pt-BR">Esse email serve para informá-lo que houve um problema com seu método de pagamento para o pedido #</value>
         <value xml:lang="ro">Acest email este pentru a te informa ca  sunt probleme cu metoda ta de plata a comenzii #</value>
         <value xml:lang="ru">Это сообщение информирует вас о наличии проблем с указанным вами способом оплаты по заказу №</value>
@@ -4012,7 +4016,7 @@
         <value xml:lang="hi-IN">आपका आर्डर इस इमेल पर भेजा जाएगा</value>
         <value xml:lang="it">Il tuo ordine sarà spedito ai seguenti indirizzi email</value>
         <value xml:lang="ja">あなたの注文内容は次のEメールアドレスに送られます</value>
-        <value xml:lang="nl">Uw bestelling zal naar het volgende e-mailadres(sen) worden gestuurd.</value>
+        <value xml:lang="nl">Uw order zal naar het volgende e-mailadres(sen) worden gestuurd.</value>
         <value xml:lang="pt-BR">Seu pedido será enviado para os seguintes endereços de email</value>
         <value xml:lang="pt-PT">A Nota de Encomenda será enviada para o(s) seguinte(s) endereço(s) de E-mail</value>
         <value xml:lang="ro">Comanda ta va fi expediata la urmatoarele adrese email</value>
@@ -4030,7 +4034,7 @@
         <value xml:lang="hi-IN">माफ किजीये, इस इमेल मे समस्या है, ग्राहक सेवा से संपर्क किजीये अपने आर्डर के बारे मे</value>
         <value xml:lang="it">Spiacente, si è verificato un problema con questa email, per favore contatta l'assistenza clienti per informazioni rigurdanti il tuo ordine n°</value>
         <value xml:lang="ja">申し訳ありません、このEメールに問題がありました。注文に関してカスタマサービスにご連絡ください。注文No</value>
-        <value xml:lang="nl">Onze excuses, er was een probleem met deze e-mail. Neem contact op met klantenservice voor informatie over de bestelling.</value>
+        <value xml:lang="nl">Onze excuses, er was een probleem met deze e-mail. Neem contact op met klantenservice voor informatie over de order.</value>
         <value xml:lang="pt-BR">Sentimos muito, houve um problema com esse email. Por favor, entre contato com o serviço ao cliente para maiores informações a respeito de seu pedido #</value>
         <value xml:lang="ro">Cerem Scuze, sunt probleme cu acest email, va rugam contactati serviciul Subiecti pentru informatii referitoare la comanda ta #</value>
         <value xml:lang="ru">Извините, в случае проблем с этим сообщением, пожалуйста свяжитесь со службой технической поддержки для получения информации по заказу №</value>
@@ -4299,7 +4303,7 @@
         <value xml:lang="fr">commandes d'achat</value>
         <value xml:lang="it">ordini di acquisto</value>
         <value xml:lang="ja">購買注文</value>
-        <value xml:lang="nl">Inkoopbestellingen</value>
+        <value xml:lang="nl">Inkooporders</value>
         <value xml:lang="pt-BR">Pedidos de compra</value>
         <value xml:lang="ru">закупочные заказы</value>
         <value xml:lang="th">รายการสั่งซื้อสินค้า</value>
@@ -4362,7 +4366,7 @@
         <value xml:lang="hi-IN">आख़री चेक आउट जान्च</value>
         <value xml:lang="it">Revisione finale ordine</value>
         <value xml:lang="ja">最終勘定確認</value>
-        <value xml:lang="nl">Laatste bestellingsoverzicht</value>
+        <value xml:lang="nl">Laatste orderoverzicht</value>
         <value xml:lang="pt-BR">Revisão final de conclusão do pagamento</value>
         <value xml:lang="pt-PT">Revisão Final Do Pagamento</value>
         <value xml:lang="ro">Revizie Checkout Final</value>
@@ -4379,7 +4383,7 @@
         <value xml:lang="fr">Finaliser la commande</value>
         <value xml:lang="it">Concludi Ordine</value>
         <value xml:lang="ja">注文を完了</value>
-        <value xml:lang="nl">Bestelling afronden (maximale opties)</value>
+        <value xml:lang="nl">Order afronden (maximale opties)</value>
         <value xml:lang="pt-BR">Finalizar pedido</value>
         <value xml:lang="ro">Conclude Comenzi </value>
         <value xml:lang="ru">Завершить</value>
@@ -4396,7 +4400,7 @@
         <value xml:lang="fr">Terminer avec les options par défaut</value>
         <value xml:lang="it">Concludi Ordine Con Valori di Default</value>
         <value xml:lang="ja">デフォルトのオプションで注文を完了</value>
-        <value xml:lang="nl">Bestelling afronden (Standaard opties)</value>
+        <value xml:lang="nl">Order afronden (Standaard opties)</value>
         <value xml:lang="pt-BR">Finalizar pedido com opções padrão</value>
         <value xml:lang="ro">Conclude Comenzi cu Valori de Default</value>
         <value xml:lang="ru">Закрыть с параметрами по умолчанию</value>
@@ -4412,7 +4416,7 @@
         <value xml:lang="fr">Recherche de commandes</value>
         <value xml:lang="it">Ricerca ordini</value>
         <value xml:lang="ja">注文を検索</value>
-        <value xml:lang="nl">Zoeken bestellingen</value>
+        <value xml:lang="nl">Zoeken orders</value>
         <value xml:lang="pt-BR">Buscar pedido</value>
         <value xml:lang="ro">Cauta Comenzi </value>
         <value xml:lang="ru">Поиск заказов</value>
@@ -4524,7 +4528,7 @@
         <value xml:lang="fr">Forcer l'achèvement de la commande d'achat</value>
         <value xml:lang="it">Forza completamento ordine di acquisto</value>
         <value xml:lang="ja">購買注文を強制完了</value>
-        <value xml:lang="nl">Inkoopbestelling forceren</value>
+        <value xml:lang="nl">Inkooporder forceren</value>
         <value xml:lang="pt-BR">Forçar finalização do pedido de compra</value>
         <value xml:lang="ru">Принудительное завершение закупочного заказа</value>
         <value xml:lang="th">รายการสั่งซื้อสินค้าเสร็จสมบูรณ์</value>
@@ -4645,7 +4649,7 @@
         <value xml:lang="fr">Montants totals bruts (incluant les ajustements et les commandes en attente)</value>
         <value xml:lang="it">Importi Lordi (include aggiustamenti e ordini sospesi)</value>
         <value xml:lang="ja">総合計金額(調整および保留の注文を含む)</value>
-        <value xml:lang="nl">Totaalbedrag (inclusief aanpassingen en openstaande bestellingen).</value>
+        <value xml:lang="nl">Totaalbedrag (inclusief aanpassingen en openstaande orders).</value>
         <value xml:lang="pt-BR">Quantias totais brutas (incluem ajustes e pedidos pendentes)</value>
         <value xml:lang="ro">Valoare Bruta  (include Modificari si comenzi suspendate)</value>
         <value xml:lang="ru">Валовые суммы в долларах (включая надбавки и ожидающие заказы)</value>
@@ -4662,7 +4666,7 @@
         <value xml:lang="fr">Lignes de ventes brutes (incluant les promotions et les commandes en attente)</value>
         <value xml:lang="it">Righe Vendute Lorde (include promozioni e ordini sospesi)</value>
         <value xml:lang="ja">総販売アイテム数(プロモーションおよび保留の注文を含む)</value>
-        <value xml:lang="nl">Totaalbedrag verkocht (inclusief promoties en lopende bestellingen).</value>
+        <value xml:lang="nl">Totaalbedrag verkocht (inclusief promoties en lopende orders).</value>
         <value xml:lang="pt-BR">Total bruto de itens vendidos (inclui promoções e pedidos pendentes)</value>
         <value xml:lang="ro">Linii Vandute Brute  (include promotii si comenzi suspendate)</value>
         <value xml:lang="ru">Валовые продажи по позициям (включая предложения и ожидающие заказы)</value>
@@ -4695,6 +4699,7 @@
         <value xml:lang="fr">Historique non disponible</value>
         <value xml:lang="it">Storia non disponibile</value>
         <value xml:lang="ja">履歴は有効ではありません</value>
+        <value xml:lang="nl">Historie niet beschikbaar/aanwezig.</value>
         <value xml:lang="pt-BR">Histórico indisponível</value>
         <value xml:lang="vi">Không có lịch sử nào</value>
         <value xml:lang="zh">无历史资料</value>
@@ -4708,7 +4713,7 @@
         <value xml:lang="fr">Bloquer la commande</value>
         <value xml:lang="it">Congela Ordine</value>
         <value xml:lang="ja">注文を保留</value>
-        <value xml:lang="nl">Bestelling in wacht zetten</value>
+        <value xml:lang="nl">Order in wacht zetten</value>
         <value xml:lang="pt-BR">Reter pedido</value>
         <value xml:lang="ro">Congeleaza Comenzi </value>
         <value xml:lang="ru">Приостановить заказа</value>
@@ -4876,7 +4881,7 @@
         <value xml:lang="fr">Saisie rapide d'une commande d'achat</value>
         <value xml:lang="it">Inserimento Veloce Ordine Acquisto</value>
         <value xml:lang="ja">購買注文をクイック入力</value>
-        <value xml:lang="nl">Snel een inkoopbestelling maken</value>
+        <value xml:lang="nl">Snel een inkooporder maken</value>
         <value xml:lang="pt-BR">Criação rápida de pedido de compra</value>
         <value xml:lang="ro">Inseriment Rapid Comanda Comparare OrderInternalCode = Cod Intern</value>
         <value xml:lang="ru">Быстрый ввод закупочного заказа</value>
@@ -5376,7 +5381,7 @@
         <value xml:lang="fr">Lien depuis ligne de commande</value>
         <value xml:lang="it">Link da una riga ordine</value>
         <value xml:lang="ja">注文アイテムからリンク</value>
-        <value xml:lang="nl">Gelinkt vanaf bestellingregel</value>
+        <value xml:lang="nl">Gelinkt vanaf orderregel</value>
         <value xml:lang="pt-BR">Referido de um item do pedido</value>
         <value xml:lang="ru">Связь от позиции заказа</value>
         <value xml:lang="th">ลิงค์จากรายการสั่งซื้อสินค้าสินค้า</value>
@@ -5527,7 +5532,7 @@
         <value xml:lang="fr">Gestion de Commandes</value>
         <value xml:lang="it">Gestione ordini</value>
         <value xml:lang="ja">注文管理</value>
-        <value xml:lang="nl">Bestelling Manager</value>
+        <value xml:lang="nl">Order Manager</value>
         <value xml:lang="pt-BR">Gestão de pedidos</value>
         <value xml:lang="ro">Aplicatie Gestiune Comenzi</value>
         <value xml:lang="ru">Управление заказами</value>
@@ -5544,7 +5549,7 @@
         <value xml:lang="fr">Gestion de Commandes</value>
         <value xml:lang="it">Applicazione gestione ordini</value>
         <value xml:lang="ja">注文管理業務</value>
-        <value xml:lang="nl">OFBiz: Bestelling Manager</value>
+        <value xml:lang="nl">OFBiz: Order Manager</value>
         <value xml:lang="pt-BR">Aplicativo de gestão de pedidos</value>
         <value xml:lang="ro">Aplicatie Gestiune Comenzi</value>
         <value xml:lang="ru">Управление заказами</value>
@@ -5766,7 +5771,7 @@
         <value xml:lang="fr">Nouvelle commande</value>
         <value xml:lang="it">Nuovo ordine</value>
         <value xml:lang="ja">新規注文</value>
-        <value xml:lang="nl">Nieuwe bestelling</value>
+        <value xml:lang="nl">Nieuwe order</value>
         <value xml:lang="pt-BR">Novo pedido</value>
         <value xml:lang="pt-PT">Nova Encomenda</value>
         <value xml:lang="ro">Noua Comanda</value>
@@ -6070,7 +6075,7 @@
         <value xml:lang="fr">Aucune note pour cette commande</value>
         <value xml:lang="it">Nessuna nota per questo ordine.</value>
         <value xml:lang="ja">この注文に連絡はありません</value>
-        <value xml:lang="nl">Geen notities voor deze bestelling</value>
+        <value xml:lang="nl">Geen notities voor deze order</value>
         <value xml:lang="pt-BR">Nenhuma nota para esse pedido</value>
         <value xml:lang="ro">Nici-o nota pentru aceasta comanda.</value>
         <value xml:lang="ru">Нет примечаний для этого заказа</value>
@@ -6122,7 +6127,7 @@
         <value xml:lang="hi-IN">कोई आर्डर नही मिला</value>
         <value xml:lang="it">Nessun ordine trovato</value>
         <value xml:lang="ja">注文はありません</value>
-        <value xml:lang="nl">Geen bestellingen gevonden</value>
+        <value xml:lang="nl">Geen orders gevonden</value>
         <value xml:lang="pt-BR">Nenhum pedido encontrado</value>
         <value xml:lang="pt-PT">Não Foram Encontradas Encomendas</value>
         <value xml:lang="ro">Nici-o Comanda Gasita</value>
@@ -6139,7 +6144,7 @@
         <value xml:lang="fr">Aucune commande trouvés pour réf. d'acteur</value>
         <value xml:lang="it">Nessun Ordine Trovato per il soggetto</value>
         <value xml:lang="ja">注文はありません、取引先ID:</value>
-        <value xml:lang="nl">Geen bestellingen gevonden voor deze relatie</value>
+        <value xml:lang="nl">Geen orders gevonden voor deze relatie</value>
         <value xml:lang="pt-BR">Nenhum pedido encontrado para esse ID de participante (partyId)</value>
         <value xml:lang="ro">Nici-o Comanda Gasita pentru subiectul</value>
         <value xml:lang="ru">Для контрагента заказы не найдены</value>
@@ -6155,7 +6160,7 @@
         <value xml:lang="fr">Aucune ligne de commande à afficher</value>
         <value xml:lang="it">Nessuna riga ordine da visualizzare.</value>
         <value xml:lang="ja">注文アイテムはありません</value>
-        <value xml:lang="nl">Geen bestellingregels</value>
+        <value xml:lang="nl">Geen orderregels</value>
         <value xml:lang="pt-BR">Nenhum item de pedido para mostrar.</value>
         <value xml:lang="ro">Nici-o linie de comanda de vizualizare.</value>
         <value xml:lang="ru">Нет заказанных позиций для показа.</value>
@@ -6172,7 +6177,7 @@
         <value xml:lang="fr">Aucune préférence de paiement liée à cette commande</value>
         <value xml:lang="it">Nessuna preferenza pagamento con questo ordine.</value>
         <value xml:lang="ja">この注文に支払の選択はありません</value>
-        <value xml:lang="nl">Geen betaalvoorkeur voor deze bestelling</value>
+        <value xml:lang="nl">Geen betaalvoorkeur voor deze order</value>
         <value xml:lang="pt-BR">Sem preferências de pagamento para esse pedido.</value>
         <value xml:lang="ru">Платежных предпочтений ассоциированных с этим заказом нет.</value>
         <value xml:lang="th">ไม่มีสิทธิพิเศษที่เกี่ยวข้องกับการชำระเงินด้วยรายการสั่งซื้อสินค้านี้</value>
@@ -6197,7 +6202,7 @@
         <value xml:lang="fr">Aucune commande d'achat spécifiée</value>
         <value xml:lang="it">Nessun ordine di acquisto specificato</value>
         <value xml:lang="ja">指定された購買注文はありません</value>
-        <value xml:lang="nl">Geen inkoopbestelling gespecificeerd</value>
+        <value xml:lang="nl">Geen inkooporder gespecificeerd</value>
         <value xml:lang="pt-BR">Nenhum pedido de venda especificado</value>
         <value xml:lang="th">ไม่มีรายการสั่งซื้อสินค้าที่ระบุ</value>
         <value xml:lang="vi">Chưa Đơn hàng bán (PO) nào được chọn</value>
@@ -6243,7 +6248,7 @@
         <value xml:lang="fr">Aucune commande d'achat n'a été spécifiée</value>
         <value xml:lang="it">Nessun Ordine di Acquisto è stato specificato</value>
         <value xml:lang="ja">指定された購買注文はありません</value>
-        <value xml:lang="nl">Geen inkoopbestelling gespecificeerd.</value>
+        <value xml:lang="nl">Geen inkooporder gespecificeerd.</value>
         <value xml:lang="pt-BR">Nenhum pedido de venda foi especificado</value>
         <value xml:lang="ro">Nici-o Comanda de Cumparare a fost specificata</value>
         <value xml:lang="ru">Не указаны закупочные заказы</value>
@@ -6346,7 +6351,7 @@
         <value xml:lang="hi-IN">आर्डर मे कोई सामान वापस करने योग्य नही</value>
         <value xml:lang="it">Nessuna riga reso trovata per l'ordine</value>
         <value xml:lang="ja">注文に返品可能なアイテムはありません</value>
-        <value xml:lang="nl">Geen  retourzendingen gevonden voor bestelling</value>
+        <value xml:lang="nl">Geen  retourzendingen gevonden voor order</value>
         <value xml:lang="pt-BR">Nenhum item que pode ser devolvido encontrado no pedido</value>
         <value xml:lang="pt-PT">Não foram encontrados itens restituíveis para encomenda</value>
         <value xml:lang="ro">Nici-o linie returnare gasita pentru comanda</value>
@@ -6448,7 +6453,7 @@
         <value xml:lang="fr">Non utilisé pour les commandes d'achat</value>
         <value xml:lang="it">Non Usato Per Ordini Acquisto</value>
         <value xml:lang="ja">購買注文で使用しない</value>
-        <value xml:lang="nl">Niet in gebruik voor inkoopbestelling</value>
+        <value xml:lang="nl">Niet in gebruik voor inkooporder</value>
         <value xml:lang="pt-BR">Não utilizado para pedidos de compra</value>
         <value xml:lang="ro">Nu este folosit Pentru Comenzi de Cumparare</value>
         <value xml:lang="ru">Не используется в закупочных заказах</value>
@@ -6666,7 +6671,7 @@
         <value xml:lang="fr">Offline: chèque, espèces</value>
         <value xml:lang="it">Offline: Assegno/Ordine Soldi</value>
         <value xml:lang="ja">オフライン: 小切手/現金</value>
-        <value xml:lang="nl"> Faktuur: Check/Money Bestelling</value>
+        <value xml:lang="nl"> Faktuur: Cheque/Money Order</value>
         <value xml:lang="pt-BR">Offline: Cheque/Dinheiro</value>
         <value xml:lang="ro">Offline: Cec/Ordin de plata</value>
         <value xml:lang="ru">Оффлайн: Чек/Деньги заказ</value>
@@ -6818,7 +6823,7 @@
         <value xml:lang="hi-IN">आर्डर</value>
         <value xml:lang="it">Ordine</value>
         <value xml:lang="ja">注文</value>
-        <value xml:lang="nl">Bestelling</value>
+        <value xml:lang="nl">Order</value>
         <value xml:lang="pt-BR">Pedido</value>
         <value xml:lang="pt-PT">Encomenda</value>
         <value xml:lang="ro">Comanda</value>
@@ -6905,7 +6910,7 @@
         <value xml:lang="fr">Création</value>
         <value xml:lang="it">Inserimento ordine</value>
         <value xml:lang="ja">注文エントリ</value>
-        <value xml:lang="nl">Invoeren bestelling</value>
+        <value xml:lang="nl">Invoeren order</value>
         <value xml:lang="pt-BR">Criação do pedido</value>
         <value xml:lang="ro">Introducere Comanda </value>
         <value xml:lang="ru">Ввод заказа</value>
@@ -6922,7 +6927,7 @@
         <value xml:lang="fr">Saisie de l'intitulé et de la devise de la commande</value>
         <value xml:lang="it">Inserire Valuta Ordine, Contratti, e Date Spedizione</value>
         <value xml:lang="ja">注文の通貨、同意書、および発送日を入力してください</value>
-        <value xml:lang="nl">Invoeren bestellinggegevens (behalve valuta, catalogus, is deze informatie nog aan te passen) </value>
+        <value xml:lang="nl">Invoeren ordergegevens (behalve valuta, catalogus, is deze informatie nog aan te passen) </value>
         <value xml:lang="pt-BR">Informar moeda do pedido, acordos e datas de envio</value>
         <value xml:lang="ro">Introducere Valuta Comanda, Contracte, si Data Expediere</value>
         <value xml:lang="ru">Введите валюту заказа, договора и даты поставки</value>
@@ -6938,7 +6943,7 @@
         <value xml:lang="fr">Information sur le client</value>
         <value xml:lang="it">Inserimento Informazioni Ordine</value>
         <value xml:lang="ja">注文エントリ顧客情報</value>
-        <value xml:lang="nl">Bestellingklant-info</value>
+        <value xml:lang="nl">Orderklant-info</value>
         <value xml:lang="pt-BR">Informações do cliente</value>
         <value xml:lang="ro">Introducere Informatii Comenzi </value>
         <value xml:lang="ru">Ввод информации о клиенте заказа</value>
@@ -6972,7 +6977,7 @@
         <value xml:lang="fr">Conditions de règlement</value>
         <value xml:lang="it">Inserimento Termini Ordine</value>
         <value xml:lang="ja">注文エントリ注文条件</value>
-        <value xml:lang="nl">Bestelling-bestelvoorwaarden</value>
+        <value xml:lang="nl">Order-bestelvoorwaarden</value>
         <value xml:lang="pt-BR">Condições do pedido</value>
         <value xml:lang="ro">Introducere Termene Comanda</value>
         <value xml:lang="ru">Введите условия заказа</value>
@@ -6989,7 +6994,7 @@
         <value xml:lang="fr">Configuration des modes de règlement</value>
         <value xml:lang="it">Inserimento Configurazione Pagamento Ordine</value>
         <value xml:lang="ja">注文エントリ支払設定</value>
-        <value xml:lang="nl">Bestelling-betaalinstellingen</value>
+        <value xml:lang="nl">Order-betaalinstellingen</value>
         <value xml:lang="pt-BR">Condições de pagamento do pedido</value>
         <value xml:lang="ro">Introducere Configuratie Plata Comanda</value>
         <value xml:lang="ru">Введите настройки оплаты заказа</value>
@@ -7006,7 +7011,7 @@
         <value xml:lang="fr">Renseignements sur la livraison</value>
         <value xml:lang="it">Inserimento Configurazione Spedire-A Ordine</value>
         <value xml:lang="ja">注文エントリ発送先設定</value>
-        <value xml:lang="nl">Bestelling verzendinstellingen</value>
+        <value xml:lang="nl">Order-verzendinstellingen</value>
         <value xml:lang="pt-BR">Escolhas para o envio do pedido</value>
         <value xml:lang="ro">Introducere Configuratie Expediere la Comanda</value>
         <value xml:lang="ru">Введите настройки доставки заказа</value>
@@ -7023,7 +7028,7 @@
         <value xml:lang="fr">Commande pour</value>
         <value xml:lang="it">Ordine per</value>
         <value xml:lang="ja">注文:</value>
-        <value xml:lang="nl">Bestelling voor</value>
+        <value xml:lang="nl">Order voor</value>
         <value xml:lang="pt-BR">Pedido para</value>
         <value xml:lang="ro">Comanda pentru </value>
         <value xml:lang="ru">Заказ для</value>
@@ -7040,7 +7045,7 @@
         <value xml:lang="fr">Commande(s) trouvée(s)</value>
         <value xml:lang="it">Ordine(i) Trovato(i)</value>
         <value xml:lang="ja">次の注文があります</value>
-        <value xml:lang="nl">Bestelling(en) gevonden</value>
+        <value xml:lang="nl">Order(s) gevonden</value>
         <value xml:lang="pt-BR">Pedidos encontrado</value>
         <value xml:lang="ro">Comand(enzi) Gasita(e)</value>
         <value xml:lang="ru">Найденные заказы</value>
@@ -7057,7 +7062,7 @@
         <value xml:lang="fr">Informations d'en-tête</value>
         <value xml:lang="it">Informazioni Testata Ordine</value>
         <value xml:lang="ja">注文ヘッダ情報</value>
-        <value xml:lang="nl">Bestelling kopgegevens</value>
+        <value xml:lang="nl">Orderkop</value>
         <value xml:lang="pt-BR">Informações do cabeçalho do pedido</value>
         <value xml:lang="ro">Informatii Antet Comanda</value>
         <value xml:lang="ru">Оглавление заказа</value>
@@ -7085,7 +7090,7 @@
         <value xml:lang="fr">Réf. de commande</value>
         <value xml:lang="it">Numero Ordine</value>
         <value xml:lang="ja">注文ID</value>
-        <value xml:lang="nl">Bestelling ID</value>
+        <value xml:lang="nl">Order ID</value>
         <value xml:lang="pt-BR">ID do pedido</value>
         <value xml:lang="ro">Numar Comanda</value>
         <value xml:lang="ru">Код заказа</value>
@@ -7136,7 +7141,7 @@
         <value xml:lang="hi-IN">माल आर्डर किजीये</value>
         <value xml:lang="it">Articoli ordinati</value>
         <value xml:lang="ja">注文アイテム</value>
-        <value xml:lang="nl">Bestellingregels</value>
+        <value xml:lang="nl">Orderregels</value>
         <value xml:lang="pt-BR">Itens do pedido</value>
         <value xml:lang="pt-PT">Itens da Encomenda</value>
         <value xml:lang="ro">Linii Comanda</value>
@@ -7154,7 +7159,7 @@
         <value xml:lang="fr">Liste des commandes</value>
         <value xml:lang="it">Lista ordini</value>
         <value xml:lang="ja">アイテム一覧</value>
-        <value xml:lang="nl">Bestellingen</value>
+        <value xml:lang="nl">Orders</value>
         <value xml:lang="pt-BR">Lista de pedidos</value>
         <value xml:lang="ro">Lista Comanda</value>
         <value xml:lang="ru">Список заказов</value>
@@ -7187,7 +7192,7 @@
         <value xml:lang="fr">Commandes nécessitant de l'attention</value>
         <value xml:lang="it">Ordini che Hanno bisogno di Attenzione</value>
         <value xml:lang="ja">要注意注文</value>
-        <value xml:lang="nl">Bestellingen die aandacht nodig hebben</value>
+        <value xml:lang="nl">Orders die aandacht nodig hebben</value>
         <value xml:lang="pt-BR">Pedidos que necessitam de atenção</value>
         <value xml:lang="ro">Comenzi care au nevoie de Atentie</value>
         <value xml:lang="ru">Заказы требующие внимания</value>
@@ -7281,7 +7286,7 @@
         <value xml:lang="fr">Renseignements des options de commande</value>
         <value xml:lang="it">Configurazione Opzioni Ordine</value>
         <value xml:lang="ja">注文オプション設定</value>
-        <value xml:lang="nl">Bestellingopties instellen</value>
+        <value xml:lang="nl">Orderopties instellen</value>
         <value xml:lang="pt-BR">Configurações de opções do pedido</value>
         <value xml:lang="ro">Configurare Optiuni Comanda</value>
         <value xml:lang="ru">Дополнительные настройки заказа</value>
@@ -7445,7 +7450,7 @@
         <value xml:lang="fr">Qté de la commande</value>
         <value xml:lang="it">Qnt Ordine</value>
         <value xml:lang="ja">注文数量</value>
-        <value xml:lang="nl">Bestellingtellingen</value>
+        <value xml:lang="nl">Ordertellingen</value>
         <value xml:lang="pt-BR">Quantidade do pedido</value>
         <value xml:lang="ro">Cant Comanda</value>
         <value xml:lang="ru">Количество в заказе</value>
@@ -8467,7 +8472,7 @@
         <value xml:lang="fr">Commandes reçues le</value>
         <value xml:lang="it">Ordini ricevuti il</value>
         <value xml:lang="ja">受取済の注文</value>
-        <value xml:lang="nl">Bestellingen ontvangen op</value>
+        <value xml:lang="nl">Orders ontvangen op</value>
         <value xml:lang="pt-BR">Pedido recebido em</value>
         <value xml:lang="vi">Đặt hàng đã nhận ngày</value>
         <value xml:lang="zh">收到订单日期</value>
@@ -8531,7 +8536,7 @@
         <value xml:lang="fr">Page des statistiques des ventes</value>
         <value xml:lang="it">Pagina Statistiche Ordini</value>
         <value xml:lang="ja">注文統計ページ</value>
-        <value xml:lang="nl">Bestellingstatistieken</value>
+        <value xml:lang="nl">Orderstatistieken</value>
         <value xml:lang="pt-BR">Página de estatísticas de vendas</value>
         <value xml:lang="ro">Pagini Statistici Comenzi</value>
         <value xml:lang="ru">Страница статистики заказа</value>
@@ -8548,7 +8553,7 @@
         <value xml:lang="fr">Tâches de commande</value>
         <value xml:lang="it">Compiti Ordine</value>
         <value xml:lang="ja">注文タスク</value>
-        <value xml:lang="nl">Bestelling taken</value>
+        <value xml:lang="nl">Order taken</value>
         <value xml:lang="pt-BR">Tarefas de pedido</value>
         <value xml:lang="ro">Sarcini Comenzi</value>
         <value xml:lang="ru">Задачи по заказам</value>
@@ -8645,7 +8650,7 @@
         <value xml:lang="fr">Total commande</value>
         <value xml:lang="it">Totale Ordine</value>
         <value xml:lang="ja">注文合計</value>
-        <value xml:lang="nl">Bestelling totaal</value>
+        <value xml:lang="nl">Order totaal</value>
         <value xml:lang="pt-BR">Total do pedido</value>
         <value xml:lang="ro">Total Comenzi</value>
         <value xml:lang="ru">Заказ всего</value>
@@ -8662,7 +8667,7 @@
         <value xml:lang="fr">Type de commande</value>
         <value xml:lang="it">Tipo Ordine</value>
         <value xml:lang="ja">注文種類</value>
-        <value xml:lang="nl">Soort bestelling</value>
+        <value xml:lang="nl">Soort order</value>
         <value xml:lang="pt-BR">Tipo do pedido</value>
         <value xml:lang="ro">Tip Comenzi</value>
         <value xml:lang="ru">Тип заказа</value>
@@ -8696,7 +8701,7 @@
         <value xml:lang="fr">Commandes</value>
         <value xml:lang="it">Ordini</value>
         <value xml:lang="ja">注文</value>
-        <value xml:lang="nl">Bestellingen</value>
+        <value xml:lang="nl">Orders</value>
         <value xml:lang="pt-BR">Pedidos</value>
         <value xml:lang="pt-PT">Encomendas</value>
         <value xml:lang="ro">Comenzi</value>
@@ -8756,7 +8761,7 @@
         <value xml:lang="fr">Totaux des commandes</value>
         <value xml:lang="it">Totali Ordini</value>
         <value xml:lang="ja">注文数合計</value>
-        <value xml:lang="nl">Bestellingen totalen</value>
+        <value xml:lang="nl">Orders totalen</value>
         <value xml:lang="pt-BR">Totais de pedidos</value>
         <value xml:lang="ro">Total Comenzi</value>
         <value xml:lang="ru">Всего заказов</value>
@@ -8790,7 +8795,7 @@
         <value xml:lang="fr">Autres commandes</value>
         <value xml:lang="it">Altri Ordini</value>
         <value xml:lang="ja">その他注文数</value>
-        <value xml:lang="nl">Andere bestellingen</value>
+        <value xml:lang="nl">Andere orders</value>
         <value xml:lang="pt-BR">Outros pedidos</value>
         <value xml:lang="ro">Alte Comenzi</value>
         <value xml:lang="ru">Другие заказы</value>
@@ -9355,7 +9360,7 @@
         <value xml:lang="hi-IN">कृपया इन्तजार किजीये माल उपलब्ध होते ही भेजा जाएगा</value>
         <value xml:lang="it">Per favore aspettare fino a quando l'intero ordine è pronto prima di spedirlo</value>
         <value xml:lang="ja">すべての品物が揃うまで発送を待ってください</value>
-        <value xml:lang="nl">Wacht tot de hele bestelling beschikbaar is voor verzending</value>
+        <value xml:lang="nl">Wacht tot de hele order beschikbaar is voor verzending</value>
         <value xml:lang="pt-BR">Por favor, espere todo o pedido estar disponível para enviá-lo</value>
         <value xml:lang="pt-PT">Por favor, aguarde até a totalidade da encomenda estar pronta antes de a enviar</value>
         <value xml:lang="ro">Va rugam sa asteptati pana cand intreaga comanda este prompta de expediere. </value>
@@ -9391,7 +9396,7 @@
         <value xml:lang="fr">Préparer la commande</value>
         <value xml:lang="it">Prepara Ordine</value>
         <value xml:lang="ja">注文準備</value>
-        <value xml:lang="nl">Bestelling voorbereiden</value>
+        <value xml:lang="nl">Order voorbereiden</value>
         <value xml:lang="pt-BR">Preparar pedido</value>
         <value xml:lang="ru">Подготовить заказ</value>
         <value xml:lang="th">จัดเตรียมรายการสั่งซื้อสินค้า</value>
@@ -9440,7 +9445,7 @@
         <value xml:lang="fr">Exécuter la commande</value>
         <value xml:lang="it">Processa ordine</value>
         <value xml:lang="ja">注文を処理</value>
-        <value xml:lang="nl">Bestelling verwerken</value>
+        <value xml:lang="nl">Order verwerken</value>
         <value xml:lang="pt-BR">Processar pedido</value>
         <value xml:lang="th">ประมวลผลรายการสั่งซื้อสินค้า</value>
         <value xml:lang="vi">Xử lý đặt hàng</value>
@@ -9454,7 +9459,7 @@
         <value xml:lang="fr">Cette commande est actuellement dans un état «Active»</value>
         <value xml:lang="it">Questo ordine è attualmente in uno stato 'Attivo'.</value>
         <value xml:lang="ja">注文のステータスは現在'有効'です。</value>
-        <value xml:lang="nl">Deze bestelling heeft status 'Actief'.</value>
+        <value xml:lang="nl">Deze order heeft status 'Actief'.</value>
         <value xml:lang="pt-BR">Esse pedido está Ativo atualmente</value>
         <value xml:lang="ro">Aceasta comanda este in acest moment in stare 'Activ'.</value>
         <value xml:lang="ru">Заказ находится в состоянии 'Активный'.</value>
@@ -9470,7 +9475,7 @@
         <value xml:lang="fr">Cette commande est actuellement dans un état «Bloquée». L'activité a été suspendue.</value>
         <value xml:lang="it">Questo ordine è attualmente in uno stato 'Congelato'. L'attività è stata sospesa.</value>
         <value xml:lang="ja">この注文のステータスは現在'保留'です。作業は一時停止中です。</value>
-        <value xml:lang="nl">Deze bestelling heeft status 'Hold'. Opgeschort.</value>
+        <value xml:lang="nl">Deze order heeft status 'Hold'. Opgeschort.</value>
         <value xml:lang="pt-BR">Esse pedido está em um estado de 'espera'. A atividade foi suspensa.</value>
         <value xml:lang="ro">Aceasta Comanda este in acest moment in stare 'Congelata'. Activitatea a fost suspendata.</value>
         <value xml:lang="ru">Заказ находится в состоянии 'Удержание'. Обработка приостановлена.</value>
@@ -9722,7 +9727,7 @@
         <value xml:lang="fr">Historique des commandes qui vous ont été envoyées</value>
         <value xml:lang="it">Storia ordini inviati a te</value>
         <value xml:lang="ja">発送済の注文履歴</value>
-        <value xml:lang="nl">Bestellinghistorie voor verzonden bestellingen</value>
+        <value xml:lang="nl">Orderhistorie voor verzonden orders</value>
         <value xml:lang="pt-BR">Histórico de pedido para pedidos enviados a você</value>
         <value xml:lang="th">ข้อมูลการสั่งซื้อสินค้าสำหรับส่งให้คุณ</value>
         <value xml:lang="vi">Các Đặt hàng đã gửi tới bạn</value>
@@ -9736,7 +9741,7 @@
         <value xml:lang="fr">Commande d'achat</value>
         <value xml:lang="it">Ordine Acquisto</value>
         <value xml:lang="ja">購買注文</value>
-        <value xml:lang="nl">Inkoopbestelling</value>
+        <value xml:lang="nl">Inkooporder</value>
         <value xml:lang="pt-BR">Pedido de compra</value>
         <value xml:lang="ro">Comanda Cumparare</value>
         <value xml:lang="ru">Закупочный заказ</value>
@@ -9755,7 +9760,7 @@
         <value xml:lang="hi-IN">ख़रीदारी आर्डर नम्बर</value>
         <value xml:lang="it">N° ordine acquisto</value>
         <value xml:lang="ja">購買注文番号</value>
-        <value xml:lang="nl">Nr. inkoopbestelling</value>
+        <value xml:lang="nl">Nr. inkooporder</value>
         <value xml:lang="pt-BR">Nº do pedido de compra</value>
         <value xml:lang="pt-PT">Número de Nota de Encomenda</value>
         <value xml:lang="ro">Numar Comanda Cumparare </value>
@@ -9772,7 +9777,7 @@
         <value xml:lang="fr">Options de l'état sur commande d'achat</value>
         <value xml:lang="it">Opzioni Stampe Ordine Acquisto</value>
         <value xml:lang="ja">購買注文レポートオプション</value>
-        <value xml:lang="nl">Bestelling inkooprapportopties</value>
+        <value xml:lang="nl">Order inkooprapportopties</value>
         <value xml:lang="pt-BR">Opções de relatório de pedido de compra</value>
         <value xml:lang="ro">Optiuni Tiparire Comanda Cumparare</value>
         <value xml:lang="ru">Параметры отчета закупочного заказа</value>
@@ -9996,7 +10001,7 @@
         <value xml:lang="fr">Qté vendue</value>
         <value xml:lang="it">Qnt Venduta</value>
         <value xml:lang="ja">販売数</value>
-        <value xml:lang="nl">Verkochte hoeveelheid</value>
+        <value xml:lang="nl">Qty</value>
         <value xml:lang="pt-BR">Quant. vendida</value>
         <value xml:lang="ro">Cantitate Vanduta</value>
         <value xml:lang="ru">Прод. кол.</value>
@@ -10046,7 +10051,7 @@
         <value xml:lang="fr">Ajout rapide d'article</value>
         <value xml:lang="it">Aggiunta Veloce Riga Ordine</value>
         <value xml:lang="ja">注文アイテムをクイック追加</value>
-        <value xml:lang="nl">Bestellingregel Snel toevoegen</value>
+        <value xml:lang="nl">Orderregel Snel toevoegen</value>
         <value xml:lang="pt-BR">Adição rápida de item ao pedido</value>
         <value xml:lang="ro">Adaugare Rapida Linie Comanda</value>
         <value xml:lang="ru">Быстрое добавления позиции заказа</value>
@@ -10063,7 +10068,7 @@
         <value xml:lang="fr">Finaliser rapidement</value>
         <value xml:lang="it">Aggiunta Veloce Ordine</value>
         <value xml:lang="ja">クイック注文完了</value>
-        <value xml:lang="nl">Bestelling afronden (minimale opties)</value>
+        <value xml:lang="nl">Order afronden (minimale opties)</value>
         <value xml:lang="pt-BR">Finalização rápida do pedido</value>
         <value xml:lang="ro">Adaugare Rapida Comanda</value>
         <value xml:lang="ru">Быстро закрыть</value>
@@ -10097,7 +10102,7 @@
         <value xml:lang="fr">Réception rapide de la commande d'achat</value>
         <value xml:lang="it">Ricevimento Veloce Ordine Acquisto</value>
         <value xml:lang="ja">購買注文をクイック受取</value>
-        <value xml:lang="nl">Quick Receive Purchase Bestelling</value>
+        <value xml:lang="nl">Quick Receive Purchase Order</value>
         <value xml:lang="pt-BR">Receber rapidamente o pedido de compra</value>
         <value xml:lang="ro">Primire Rapida Comanda Cumparare</value>
         <value xml:lang="ru">Быстрый прием закупочного заказа</value>
@@ -10114,7 +10119,7 @@
         <value xml:lang="fr">Remboursement rapide de toute la commande</value>
         <value xml:lang="it">Reso Veloce Intero Ordine</value>
         <value xml:lang="ja">注文全体をクイック返済</value>
-        <value xml:lang="nl">Quick Refund Entire Bestelling</value>
+        <value xml:lang="nl">Quick Refund Entire Order</value>
         <value xml:lang="pt-BR">Reembolso rápido pelo pedido inteiro</value>
         <value xml:lang="ro">Returnare Rapida Intreaga Comanda</value>
         <value xml:lang="ru">Быстрый возврат по всему заказу</value>
@@ -10131,7 +10136,7 @@
         <value xml:lang="fr">Livraison rapide de toute la commande</value>
         <value xml:lang="it">Spedizione Veloce Intero Ordine</value>
         <value xml:lang="ja">注文全体をクイック発送</value>
-        <value xml:lang="nl">Quick Ship Entire Bestelling</value>
+        <value xml:lang="nl">Quick Ship hele order</value>
         <value xml:lang="pt-BR">Envio rápido de todo o pedido</value>
         <value xml:lang="ro">Expediere Rapida Intreaga Comanda</value>
         <value xml:lang="ru">Быстрая поставка полного заказа</value>
@@ -10277,7 +10282,7 @@
         <value xml:lang="fr">Recalculer la commande</value>
         <value xml:lang="it">Ricalcola Ordine</value>
         <value xml:lang="ja">注文を再計算</value>
-        <value xml:lang="nl">Bestelling berekenen</value>
+        <value xml:lang="nl">Order berekenen</value>
         <value xml:lang="pt-BR">Recalcular pedido</value>
         <value xml:lang="ro">Recalculeaza Comanda</value>
         <value xml:lang="ru">Пересчитать</value>
@@ -10345,7 +10350,7 @@
         <value xml:lang="fr">Sur un autre bon de livraison</value>
         <value xml:lang="it">Su gli Altri Ordini Spediti</value>
         <value xml:lang="ja">その他の配送注文</value>
-        <value xml:lang="nl">On Other Delivery Bestelling</value>
+        <value xml:lang="nl">On Other Delivery Order</value>
         <value xml:lang="pt-BR">Em outra entrega de pedido</value>
         <value xml:lang="ro">Pe Alte Comenzi Expediate</value>
         <value xml:lang="ru">На другой доставляемый заказ</value>
@@ -10361,6 +10366,7 @@
         <value xml:lang="fr">Historique des quantités reçues</value>
         <value xml:lang="it">Storia quantità ricevuta</value>
         <value xml:lang="ja">受取数量履歴</value>
+        <value xml:lang="nl">Historie hoeveelheden ontvangen</value>
         <value xml:lang="pt-BR">Histórico de quantidade recebida</value>
         <value xml:lang="vi">Lịch sử số lượng đã nhận</value>
         <value xml:lang="zh">已接收数量的历史记录</value>
@@ -10595,7 +10601,7 @@
         <value xml:lang="fr">Etat des ventes par centre de profit</value>
         <value xml:lang="it">Report Vendite per Negozio</value>
         <value xml:lang="ja">店舗別販売レポート</value>
-        <value xml:lang="nl">Sales by Store Report</value>
+        <value xml:lang="nl">Verkopen per Winkel</value>
         <value xml:lang="pt-BR">Relatório de vendas por loja</value>
         <value xml:lang="ro">Raport Vanzari Magazie</value>
         <value xml:lang="ru">Отчет по продажам, по торговым точкам</value>
@@ -10624,7 +10630,7 @@
         <value xml:lang="fr">Etats des commandes</value>
         <value xml:lang="it">Stampe Ordini</value>
         <value xml:lang="ja">注文レポート</value>
-        <value xml:lang="nl">Bestellingrapporten</value>
+        <value xml:lang="nl">Orderrapporten</value>
         <value xml:lang="pt-BR">Relatórios de pedidos</value>
         <value xml:lang="ro">Tiparire Comenzi</value>
         <value xml:lang="ru">Отчеты заказа</value>
@@ -11103,7 +11109,7 @@
         <value xml:lang="fr">Réf. de statut d'un besoin</value>
         <value xml:lang="it">Stato Ordine Fabbisogno</value>
         <value xml:lang="ja">注文要求ステータスID</value>
-        <value xml:lang="nl">Bestelling-benodigdheid status ID</value>
+        <value xml:lang="nl">Order-benodigdheid status ID</value>
         <value xml:lang="pt-BR">ID de estado do requisito de pedido</value>
         <value xml:lang="ro">Stare Comanda Necesar</value>
         <value xml:lang="ru">Код статуса требования заказа</value>
@@ -11194,7 +11200,7 @@
         <value xml:lang="fr">Ajustement(s) de retour depuis la commande</value>
         <value xml:lang="it">Reso Aggiustamento(i) Ordine Per l'Ordine</value>
         <value xml:lang="ja">返品注文調整、注文(元)</value>
-        <value xml:lang="nl">Return Bestelling Adjustment(s) From Bestelling</value>
+        <value xml:lang="nl">Return Order Adjustment(s) From Order</value>
         <value xml:lang="pt-BR">Ajustes de devolução do pedido</value>
         <value xml:lang="ro">Returnare Modificare(i) Comanda Pentru Comanda</value>
         <value xml:lang="ru">Настройки возвратного заказа из заказа</value>
@@ -11232,7 +11238,7 @@
         <value xml:lang="fr">Lieu de stockage destinataire</value>
         <value xml:lang="it">Stabilimento Destinazione </value>
         <value xml:lang="ja">対象拠点</value>
-        <value xml:lang="nl">Destination Facility</value>
+        <value xml:lang="nl">Naar faciliteit</value>
         <value xml:lang="pt-BR">Armazém de destino</value>
         <value xml:lang="ro">Compartiment Destinatie </value>
         <value xml:lang="ru">На склад</value>
@@ -11304,7 +11310,7 @@
         <value xml:lang="fr">Retourner l'article(s) de la commande</value>
         <value xml:lang="it">Riga(e) Reso Dall'Ordine</value>
         <value xml:lang="ja">返品アイテム、注文(元)</value>
-        <value xml:lang="nl">Return Item(s) From Bestelling</value>
+        <value xml:lang="nl">Return Item(s) From Order</value>
         <value xml:lang="pt-BR">Itens de devolução do pedido</value>
         <value xml:lang="ro">Linia(e) Returnare De la Comanda</value>
         <value xml:lang="ru">Возврат позиции(й) из заказа</value>
@@ -11320,7 +11326,7 @@
         <value xml:lang="fr">Acteur d'origine</value>
         <value xml:lang="it">Reso Dal Soggetto</value>
         <value xml:lang="ja">返品元取引先</value>
-        <value xml:lang="nl">Return From Party</value>
+        <value xml:lang="nl">Retournering van/door</value>
         <value xml:lang="pt-BR">Devolvido pelo participante</value>
         <value xml:lang="ro">Returnare De la Subiect</value>
         <value xml:lang="ru">Возврат от контрагента</value>
@@ -11353,6 +11359,7 @@
         <value xml:lang="fr">Historique des retours</value>
         <value xml:lang="it">Storia resi</value>
         <value xml:lang="ja">返品履歴</value>
+        <value xml:lang="nl">Historie retouren</value>
         <value xml:lang="pt-BR">Histórico de devolução</value>
         <value xml:lang="vi">Lịch sử hoàn trả</value>
         <value xml:lang="zh">退货历史记录</value>
@@ -11420,7 +11427,7 @@
         <value xml:lang="hi-IN">आर्डर से वापस सामान</value>
         <value xml:lang="it">Restituire gli articoli dell'ordine</value>
         <value xml:lang="ja">返品アイテム、注文(元)</value>
-        <value xml:lang="nl">Retourgoederen vande bestelling</value>
+        <value xml:lang="nl">Retourgoederen vande order</value>
         <value xml:lang="pt-BR">Devolução dos item(ns) do pedido</value>
         <value xml:lang="pt-PT">Devolver Itens da Encomenda</value>
         <value xml:lang="ro">Linie(ii) Returnate de la Comanda </value>
@@ -11448,7 +11455,7 @@
         <value xml:lang="fr">Charger les articles pour le retour</value>
         <value xml:lang="it">Carica righe ordine per il reso</value>
         <value xml:lang="ja">返品のため注文アイテムをロード</value>
-        <value xml:lang="nl">Load bestelling items for return</value>
+        <value xml:lang="nl">Laad orderitems voor retour</value>
         <value xml:lang="pt-BR">Carregar itens de pedido para devolução</value>
         <value xml:lang="ro">Incarca linii comanda pe returnare </value>
         <value xml:lang="ru">Загрузить позиции заказа для возврата</value>
@@ -11464,7 +11471,7 @@
         <value xml:lang="fr">Ajustement manuel du retour pour la commande</value>
         <value xml:lang="it">Reso Manuale Aggiustamento Per l'Ordine</value>
         <value xml:lang="ja">手動返品調整、注文:</value>
-        <value xml:lang="nl">Manual Return Adjustment For Bestelling</value>
+        <value xml:lang="nl">Manual Return Adjustment For Order</value>
         <value xml:lang="pt-BR">Ajuste manual para devolução do pedido</value>
         <value xml:lang="ro">Modificare Returnare Manuala pe Comanda</value>
         <value xml:lang="ru">Ручная настройка возврата для заказа</value>
@@ -11479,6 +11486,7 @@
         <value xml:lang="fr">Si positif (Y) alors le retour sera automatiquement terminée dès qu'accepté (laissant de coté le status reçu)</value>
         <value xml:lang="it">Se questo è a Y all i resi saranno automaticamente completati quando verrà accettato, saltando il processo e gli stati della ricezione.</value>
         <value xml:lang="ja">Yの場合は返品が受け取られると、ステータスと処理の受付をスキップして、自動的に完了します。</value>
+        <value xml:lang="nl">Indien Y, dan wordt de retoure na acceptatie automatisch gecompleteerd (zonder ontvangstfase).</value>
         <value xml:lang="pt-BR">Se sim (Y), então a devolução será automáticamente completada quando for aceita, ignorando o estado de recebido e processando.</value>
         <value xml:lang="vi">Nếu là Y thì Hoàn trả sẽ tự động được Kết thúc khi hoàn trả này được Chấp nhận, bỏ qua trạng thái Đã nhận và tiếp tục xử lý.</value>
         <value xml:lang="zh">如果这是Y,那么当退货被接受时它会自动完成,会跳过已接收状态及处理。</value>
@@ -11491,7 +11499,7 @@
         <value xml:lang="fr">Recevoir automatiquement sur acceptation</value>
         <value xml:lang="it">Necessario Ricezione-Automatica (in ACCETTAZIONE)</value>
         <value xml:lang="ja">受付時に自動受取</value>
-        <value xml:lang="nl">Needs Auto-Receive (On ACCEPT)</value>
+        <value xml:lang="nl">Autom. ontvangst (bij ACCEPT)</value>
         <value xml:lang="pt-BR">Receber automaticamente ao ACEITAR</value>
         <value xml:lang="ro">Necesar Receptie-Automatica (in ACCEPTARE)</value>
         <value xml:lang="ru">Автоприем (если статус Принят)</value>
@@ -11507,7 +11515,7 @@
         <value xml:lang="fr">Aucuns articles retournables trouvés pour la commande</value>
         <value xml:lang="it">Nessuna riga restituibile trovata per l'ordine</value>
         <value xml:lang="ja">注文に返品不可のアイテムがあります</value>
-        <value xml:lang="nl">No returnable items found for bestelling</value>
+        <value xml:lang="nl">Geen retourneerbarer items voor order</value>
         <value xml:lang="pt-BR">Nenhum item retornável encontrado para o pedido</value>
         <value xml:lang="ro">Nici-o linie restituita gasita pe comanda</value>
         <value xml:lang="ru">В заказе не найдены позиции которые могут быть возвращены</value>
@@ -11523,7 +11531,7 @@
         <value xml:lang="fr">Prix de retour</value>
         <value xml:lang="it">Prezzo Reso</value>
         <value xml:lang="ja">返品価格</value>
-        <value xml:lang="nl">Return Price</value>
+        <value xml:lang="nl">Prijs retour</value>
         <value xml:lang="pt-BR">Preço de devolução</value>
         <value xml:lang="ro">Pret Returnare</value>
         <value xml:lang="ru">Цена возврата</value>
@@ -11538,6 +11546,7 @@
         <value xml:lang="fr">Historique des prix de retour</value>
         <value xml:lang="it">Storia prezzi reso</value>
         <value xml:lang="ja">返品価格履歴</value>
+        <value xml:lang="nl">Historie prijs retouren</value>
         <value xml:lang="pt-BR">Histórico de preços de devolução</value>
         <value xml:lang="vi">Lịch sử giá hoàn trả</value>
         <value xml:lang="zh">退货价格历史记录</value>
@@ -11581,6 +11590,7 @@
         <value xml:lang="fr">Historique des quantités de retour</value>
         <value xml:lang="it">Storia quantità resa</value>
         <value xml:lang="ja">返品数量履歴</value>
+        <value xml:lang="nl">Historie hoeveelheden retouren</value>
         <value xml:lang="pt-BR">Histórico de quantidade de devolução</value>
         <value xml:lang="vi">Lịch sử số lượng hoàn trả</value>
         <value xml:lang="zh">退货数量历史记录</value>
@@ -11593,7 +11603,7 @@
         <value xml:lang="fr">Motif</value>
         <value xml:lang="it">Motivo</value>
         <value xml:lang="ja">理由</value>
-        <value xml:lang="nl">Reason</value>
+        <value xml:lang="nl">Reden</value>
         <value xml:lang="pt-BR">Razão</value>
         <value xml:lang="ro">Motiv</value>
         <value xml:lang="ru">Причина</value>
@@ -11608,6 +11618,7 @@
         <value xml:lang="fr">Historique des raisons de retour</value>
         <value xml:lang="it">Storia motivazione reso</value>
         <value xml:lang="ja">返品理由履歴</value>
+        <value xml:lang="nl">Historie redenen retouren</value>
         <value xml:lang="pt-BR">Histórico de motivação para devolução</value>
         <value xml:lang="vi">Lịch sử nguyên nhân hoàn trả</value>
         <value xml:lang="zh">退货原因历史记录</value>
@@ -11736,7 +11747,7 @@
         <value xml:lang="fr">Total du retour</value>
         <value xml:lang="it">Totale Reso</value>
         <value xml:lang="ja">返品合計</value>
-        <value xml:lang="nl">Return Total</value>
+        <value xml:lang="nl">Totaal retouren</value>
         <value xml:lang="pt-BR">Total de devolução</value>
         <value xml:lang="ro">Total Returnare</value>
         <value xml:lang="ru">Общая по возврату</value>
@@ -11768,6 +11779,7 @@
         <value xml:lang="fr">Historique des types de retour</value>
         <value xml:lang="it">Storia tipo reso</value>
         <value xml:lang="ja">返品種類履歴</value>
+        <value xml:lang="nl">Historie type retouren</value>
         <value xml:lang="pt-BR">Histórico de tipo de devolução</value>
         <value xml:lang="vi">Lịch sử kiểu hoàn trả</value>
         <value xml:lang="zh">退货类型历史记录</value>
@@ -11808,7 +11820,7 @@
         <value xml:lang="fr">Vérifier la commande</value>
         <value xml:lang="it">Modifica Ordine</value>
         <value xml:lang="ja">注文確認</value>
-        <value xml:lang="nl">Review Bestelling</value>
+        <value xml:lang="nl">Order reviewen</value>
         <value xml:lang="pt-BR">Repassar pedido</value>
         <value xml:lang="ro">Modifica Comanda</value>
         <value xml:lang="ru">Просмотр заказа</value>
@@ -11825,7 +11837,7 @@
         <value xml:lang="fr">Exécuter</value>
         <value xml:lang="it">Esegui Azione</value>
         <value xml:lang="ja">操作実行</value>
-        <value xml:lang="nl">Run Action</value>
+        <value xml:lang="nl">Actie uitvoeren</value>
         <value xml:lang="pt-BR">Executar ação</value>
         <value xml:lang="ro">Executa Actiune</value>
         <value xml:lang="ru">Выполнить действие</value>
@@ -11841,7 +11853,7 @@
         <value xml:lang="fr">Exécuter les promotions du centre de profit</value>
         <value xml:lang="it">Esegui Promozioni Negozio</value>
         <value xml:lang="ja">店舗プロモーションを実行</value>
-        <value xml:lang="nl">Run Store Promotions</value>
+        <value xml:lang="nl">Winkel promos uitvoeren</value>
         <value xml:lang="pt-BR">Aplicar promoções da loja</value>
         <value xml:lang="ro">Executa Promotie Magazie</value>
         <value xml:lang="ru">Начать акцию в торговой точке</value>
@@ -11886,7 +11898,7 @@
         <value xml:lang="fr">Commande de vente</value>
         <value xml:lang="it">Ordine Vendita</value>
         <value xml:lang="ja">販売注文</value>
-        <value xml:lang="nl">Verkoopbestelling</value>
+        <value xml:lang="nl">Verkooporder</value>
         <value xml:lang="pt-BR">Pedido de venda</value>
         <value xml:lang="ro">Comanda Vanzare </value>
         <value xml:lang="ru">Заказ на продажу</value>
@@ -11976,7 +11988,7 @@
         <value xml:lang="fr">Planifier l'expédition</value>
         <value xml:lang="it">Schedulazione Consegna</value>
         <value xml:lang="ja">配送スケジュール</value>
-        <value xml:lang="nl">Schedule Delivery</value>
+        <value xml:lang="nl">Levering plannen</value>
         <value xml:lang="pt-BR">Agendar envio</value>
         <value xml:lang="ro">Planificare Livrare </value>
         <value xml:lang="ru">Запланированная доставка</value>
@@ -12055,7 +12067,7 @@
         <value xml:lang="fr">Choisir un accord pour cette commande</value>
         <value xml:lang="it">Seleziona un contratto per questo ordine</value>
         <value xml:lang="ja">この注文の同意書を選択</value>
-        <value xml:lang="nl">Select an agreement for this bestelling</value>
+        <value xml:lang="nl">Selecteer contract voor deze order</value>
         <value xml:lang="pt-BR">Selecione um acordo para esse pedido</value>
         <value xml:lang="ro">Selectioneaza un contract pentru aceasta comanda</value>
         <value xml:lang="ru">Выберите договор для этого заказа</value>
@@ -12101,7 +12113,7 @@
         <value xml:lang="fr">Ou sélectionnez une devise pour cette commande</value>
         <value xml:lang="it">O imposta una valuta per questo ordine</value>
         <value xml:lang="ja">またはこの注文の通貨設定</value>
-        <value xml:lang="nl">Or set a currency for this bestelling</value>
+        <value xml:lang="nl">Of zet een valuta voor deze order</value>
         <value xml:lang="pt-BR">Ou selecione uma moeda para esse pedido</value>
         <value xml:lang="ro">Sau seteaza o valuta pentru aceasta comanda</value>
         <value xml:lang="ru">Или установите валюту заказа</value>
@@ -12127,7 +12139,7 @@
         <value xml:lang="fr">Sélectionnez le type d'acteurs à associer à la commande</value>
         <value xml:lang="it">Seleziona il tipo di Soggetto da associare all'ordine</value>
         <value xml:lang="ja">注文に関連付ける取引先の種類を選択</value>
-        <value xml:lang="nl">Select type of party to associate to bestelling</value>
+        <value xml:lang="nl">Select soort partij om aan order te koppelen</value>
         <value xml:lang="pt-BR">Selecione o tipo de participante para associar ao pedido</value>
         <value xml:lang="ro">Selectioneaza tipul de Subiect de asociat la comanda</value>
         <value xml:lang="ru">Выберите ассоциированный с заказом тип контрагента</value>
@@ -12236,7 +12248,7 @@
         <value xml:lang="fr">La promotion ne s'applique pas sur tous les articles. Ceux sur lesquels elle peut s'appliquer sont sélectionnés, les autres restent inchangés.</value>
         <value xml:lang="it">Selezionato un Omaggio che non è disponibile per tutte le righe. Le righe che sono disponibile sono state selezionate, le altre rimarranno invariate.</value>
         <value xml:lang="ja">すべてのアイテムで選択したギフト方法は有効ではありません。有効なアイテムが選択されています、その他は変更ありません。</value>
-        <value xml:lang="nl">Selected Gift Wrap is not available for all items. The items which are available have been selected, the others remain unchanged.</value>
+        <value xml:lang="nl">Gekozen kadoverpakking is niet voor alle artikelen beschikbaar. De artikelen van toepassing zijn geselecteerd, de andere veranderen niet.</value>
         <value xml:lang="pt-BR">O embrulho pra presente selecionado não está disponível para todos os itens. Os itens para os quais está disponível foram selecionados, os demais permanecem sem alterações.</value>
         <value xml:lang="ro">Selectioneaza un Omagiu care nu este disponibil pe toate liniile. Liniile care sunt disponibile sunt selectionate, celelalte vor ramane invariate.</value>
         <value xml:lang="ru">Выбранная подарочная упаковка недоступна для всех позиций. Позиции для которых возможно ее использования будут выбраны, остальные нет.</value>
@@ -12380,7 +12392,7 @@
         <value xml:lang="fr">Envoi du courriel</value>
         <value xml:lang="it">Invia Email</value>
         <value xml:lang="ja">Eメールを送信</value>
-        <value xml:lang="nl">Send Email</value>
+        <value xml:lang="nl">E-mail versturen</value>
         <value xml:lang="pt-BR">Enviar email</value>
         <value xml:lang="ro">Trimite Email</value>
         <value xml:lang="ru">Послать сообщение</value>
@@ -12664,7 +12676,7 @@
         <value xml:lang="fr">Envoyer vers un autre acteur</value>
         <value xml:lang="it">Spedizione ad un'Altro Soggetto</value>
         <value xml:lang="ja">別の取引先に発送</value>
-        <value xml:lang="nl">Ship to Another Party</value>
+        <value xml:lang="nl">Naar andere partij verzenden</value>
         <value xml:lang="pt-BR">Enviar para outro participante</value>
         <value xml:lang="ro">Expediere la un'Alt Subiect</value>
         <value xml:lang="ru">Поставить другому контрагенту</value>
@@ -12920,7 +12932,7 @@
         <value xml:lang="fr">Pénurie</value>
         <value xml:lang="it">Deficit</value>
         <value xml:lang="ja">不足</value>
-        <value xml:lang="nl">Shortfalled</value>
+        <value xml:lang="nl">Tekort</value>
         <value xml:lang="pt-BR">Pendente</value>
         <value xml:lang="ro">Deficit</value>
         <value xml:lang="ru">Нехватка</value>
@@ -12936,7 +12948,7 @@
         <value xml:lang="fr">Montrer toutes les notes</value>
         <value xml:lang="it">Mostra Tutte le Note</value>
         <value xml:lang="ja">連絡をすべて表示</value>
-        <value xml:lang="nl">Show All Notes</value>
+        <value xml:lang="nl">Toon alle notities</value>
         <value xml:lang="pt-BR">Mostrar todas as notas</value>
         <value xml:lang="ro">Afiseaza Toate Notele</value>
         <value xml:lang="ru">Показать все примечания</value>
@@ -12953,7 +12965,7 @@
         <value xml:lang="fr">Montrer les notes liées à cet article</value>
         <value xml:lang="it">Mostra Questa(e) Nota(e) Riga(e)</value>
         <value xml:lang="ja">このアイテムの連絡を表示</value>
-        <value xml:lang="nl">Show This Item's Notes</value>
+        <value xml:lang="nl">Toon notities van dit element</value>
         <value xml:lang="pt-BR">Mostrar as notas desse item</value>
         <value xml:lang="ro">Afiseaza aceasta Nota </value>
         <value xml:lang="ru">Показать примечания этой позиции</value>
@@ -12969,6 +12981,7 @@
         <value xml:lang="fr">Tailles Disponibles</value>
         <value xml:lang="it">Taglie disponibili</value>
         <value xml:lang="ja">可能なサイズ</value>
+        <value xml:lang="nl">Maten beschikbaar</value>
         <value xml:lang="pt-BR">Tamanhos disponíveis</value>
         <value xml:lang="vi">Các kích cỡ sẵn có</value>
         <value xml:lang="zh">可用尺寸</value>
@@ -12980,6 +12993,7 @@
         <value xml:lang="fr">Taille</value>
         <value xml:lang="it">Taglia</value>
         <value xml:lang="ja">サイズ</value>
+        <value xml:lang="nl">Maat</value>
         <value xml:lang="pt-BR">Tamanho</value>
         <value xml:lang="vi">Kích cỡ</value>
         <value xml:lang="zh">尺寸</value>
@@ -12992,6 +13006,7 @@
         <value xml:lang="fr">Palettes</value>
         <value xml:lang="it">Pallets</value>
         <value xml:lang="ja">パレット</value>
+        <value xml:lang="nl">Pallets</value>
         <value xml:lang="pt-BR">Pallets</value>
         <value xml:lang="th">Skids Pallets</value>
         <value xml:lang="vi">Skids Pallets</value>
@@ -13201,7 +13216,7 @@
         <value xml:lang="hi-IN">आर्डर जमा करें</value>
         <value xml:lang="it">Invia ordine</value>
         <value xml:lang="ja">注文を実行</value>
-        <value xml:lang="nl">Plaats bestelling</value>
+        <value xml:lang="nl">Plaats order</value>
         <value xml:lang="pt-BR">Enviar pedido</value>
         <value xml:lang="pt-PT">Registar Encomenda</value>
         <value xml:lang="ro">Trimite Comanda </value>
@@ -13220,7 +13235,7 @@
         <value xml:lang="hi-IN">कृपया इन्तजार करें, आपके आर्डर पर काम चालू है</value>
         <value xml:lang="it">Attendere prego, elaborazione ordine...</value>
         <value xml:lang="ja">しばらくお待ちください、注文を処理中です...</value>
-        <value xml:lang="nl">Een moment, de bestelling wordt verwerkt...</value>
+        <value xml:lang="nl">Een moment, order wordt verwerkt...</value>
         <value xml:lang="pt-BR">Por favor aguarde, processando o pedido...</value>
         <value xml:lang="pt-PT">Please Wait, Processing Order...</value>
         <value xml:lang="ro">Asteapta te rog, Elaborare Comanda...</value>
@@ -13257,7 +13272,7 @@
         <value xml:lang="fr">Données fournisseur</value>
         <value xml:lang="it">Dati fornitore</value>
         <value xml:lang="ja">サプライヤデータ</value>
-        <value xml:lang="nl">Supplier Data</value>
+        <value xml:lang="nl">Data leverancier</value>
         <value xml:lang="pt-BR">Dados do fornecedor</value>
         <value xml:lang="ro">Data Furnizata</value>
         <value xml:lang="ru">Данные поставщика</value>
@@ -13274,7 +13289,7 @@
         <value xml:lang="fr">Données financières du fournisseur</value>
         <value xml:lang="it">Dati finanziari fornitore</value>
         <value xml:lang="ja">サプライヤ金融データ</value>
-        <value xml:lang="nl">Supplier Financial Data</value>
+        <value xml:lang="nl">Financiele data leverancier</value>
         <value xml:lang="pt-BR">Dados financeiros do fornecedor</value>
         <value xml:lang="ro">Data Finantiara Furnizor</value>
         <value xml:lang="ru">Финансовые данные поставщика</value>
@@ -13291,7 +13306,7 @@
         <value xml:lang="fr">Sondage</value>
         <value xml:lang="it">Sondaggio</value>
         <value xml:lang="ja">評価</value>
-        <value xml:lang="nl">Survey</value>
+        <value xml:lang="nl">Enquete</value>
         <value xml:lang="pt-BR">Levantamento</value>
         <value xml:lang="ro">Sondaj</value>
         <value xml:lang="ru">Обзор</value>
@@ -13323,7 +13338,7 @@
         <value xml:lang="hi-IN">यह आर्डर उपहार है</value>
         <value xml:lang="it">Questo ordine è un omaggio</value>
         <value xml:lang="ja">この注文はギフトです</value>
-        <value xml:lang="nl">Deze bestelling is een geschenk</value>
+        <value xml:lang="nl">Deze order is een geschenk</value>
         <value xml:lang="pt-BR">Este pedido é um presente</value>
         <value xml:lang="pt-PT">Esta encomenda é um presente</value>
         <value xml:lang="ro">Aceasta comanda este un omagiu</value>
@@ -13342,7 +13357,7 @@
         <value xml:lang="hi-IN">यह आर्डर उपहार नही है</value>
         <value xml:lang="it">Questo ordine non è un omaggio</value>
         <value xml:lang="ja">この注文はギフトではありません</value>
-        <value xml:lang="nl">Deze bestelling is geen geschenk</value>
+        <value xml:lang="nl">Deze order is geen geschenk</value>
         <value xml:lang="pt-BR">Esse pedido não é um presente</value>
         <value xml:lang="pt-PT">Esta encomenda não é um presente</value>
         <value xml:lang="ro">Aceasta comanda nu este un omagiu</value>
@@ -13358,6 +13373,7 @@
         <value xml:lang="fr">Cette commande n'a pas d'instructions de livraison</value>
         <value xml:lang="it">Quest'ordine non ha istruzioni di spedizione</value>
         <value xml:lang="ja">この注文は発送について特別な指示はありません</value>
+        <value xml:lang="nl">Deze order heeft geen verzendinfo</value>
         <value xml:lang="pt-BR">Esse pedido não possui instruções para envio</value>
         <value xml:lang="vi">Đặt hàng này không có hướng dẫn chuyển hàng</value>
         <value xml:lang="zh">本订单没有送货说明</value>
@@ -13370,7 +13386,7 @@
         <value xml:lang="fr">Cette commande est un cadeau</value>
         <value xml:lang="it">Questo ordine è un'omaggio</value>
         <value xml:lang="ja">この注文はギフトです</value>
-        <value xml:lang="nl">Deze bestelling is een geschenk</value>
+        <value xml:lang="nl">Deze order is een geschenk</value>
         <value xml:lang="pt-BR">Esse pedido é um presente</value>
         <value xml:lang="ro">Aceasta comanda este un omagiu</value>
         <value xml:lang="ru">Этот заказ - подарок</value>
@@ -13387,7 +13403,7 @@
         <value xml:lang="fr">Cette commande n'est pas un cadeau</value>
         <value xml:lang="it">Questo ordine non è un'omaggio</value>
         <value xml:lang="ja">この注文はギフトではありません</value>
-        <value xml:lang="nl">Deze bestelling is geen geschenk</value>
+        <value xml:lang="nl">Deze order is geen geschenk</value>
         <value xml:lang="pt-BR">Esse pedido não é um presente</value>
         <value xml:lang="ro">Aceasta comanda nu este un omagiu</value>
         <value xml:lang="ru">Этот заказ не подарок</value>
@@ -13504,7 +13520,7 @@
         <value xml:lang="fr">Total des autres ajustements</value>
         <value xml:lang="it">Totale Altri Aggiustamenti Ordine</value>
         <value xml:lang="ja">その他注文調整合計</value>
-        <value xml:lang="nl">Totaal overige bestelling aanpassingen</value>
+        <value xml:lang="nl">Totaal overige orderaanpassingen</value>
         <value xml:lang="pt-BR">Total de outros ajustes de pedidos</value>
         <value xml:lang="ro">Total Alte Modificari Comenzi</value>
         <value xml:lang="ru">Другие общие корректировки по заказу</value>
@@ -13572,7 +13588,7 @@
         <value xml:lang="fr">Quantité totale commandée</value>
         <value xml:lang="it">Totale quantità ordinata</value>
         <value xml:lang="ja">注文数量合計</value>
-        <value xml:lang="nl">Total quantity bestellinged</value>
+        <value xml:lang="nl">Totaal hoeveelheid georderd</value>
         <value xml:lang="pt-BR">Quantidade total encomendada</value>
         <value xml:lang="ro">Total cantitate comandata</value>
         <value xml:lang="ru">Общее заказанное количество</value>
@@ -13589,7 +13605,7 @@
         <value xml:lang="fr">Quantité totale reçue</value>
         <value xml:lang="it">Totale quantità ricevuta</value>
         <value xml:lang="ja">受取済数量合計</value>
-        <value xml:lang="nl">Total quantity received</value>
+        <value xml:lang="nl">Totale hoeveelheid ontvangen</value>
         <value xml:lang="pt-BR">Quantidade total recebida</value>
         <value xml:lang="ro">Total cantitate primita</value>
         <value xml:lang="ru">Общее полученное количество</value>
@@ -13606,7 +13622,7 @@
         <value xml:lang="fr">Quantité totale refusée</value>
         <value xml:lang="it">Totale quantità scartata</value>
         <value xml:lang="ja">拒否数量合計</value>
-        <value xml:lang="nl">Total quantity rejected</value>
+        <value xml:lang="nl">Totale hoeveelheid geweigerd</value>
         <value xml:lang="pt-BR">Quantidade total rejeitada</value>
         <value xml:lang="ro">Total cantitate rebutata</value>
         <value xml:lang="ru">Общее отмененное количество</value>
@@ -13895,7 +13911,7 @@
         <value xml:lang="fr">Estimer l'achat</value>
         <value xml:lang="it">Valore Acquisto</value>
         <value xml:lang="ja">購入額</value>
-        <value xml:lang="nl">Value Purch</value>
+        <value xml:lang="nl">Inkoopwaarde</value>
         <value xml:lang="pt-BR">Valor da compra</value>
         <value xml:lang="ro">Valoare Cumparare </value>
         <value xml:lang="ru">Стоимость приобретения</value>
@@ -13911,7 +13927,7 @@
         <value xml:lang="fr">Valeur</value>
         <value xml:lang="it">Valore Vendita</value>
         <value xml:lang="ja">販売額</value>
-        <value xml:lang="nl">Value Sold</value>
+        <value xml:lang="nl">Waarde</value>
         <value xml:lang="pt-BR">Valor de venda</value>
         <value xml:lang="ro">Valoare Vanzare</value>
         <value xml:lang="ru">Стоимость продажи</value>
@@ -14010,7 +14026,7 @@
         <value xml:lang="fr">Affichage/Modification des paramètres d'expédition</value>
         <value xml:lang="it">Mostra/Modifica Informazione Schedulazione Consegne</value>
         <value xml:lang="ja">配送スケジュールを表示/編集</value>
-        <value xml:lang="nl">View/Edit Delivery Schedule Info</value>
+        <value xml:lang="nl">View/Edit info planning levering</value>
         <value xml:lang="pt-BR">Visualizar/alterar agendamentos de entrega</value>
         <value xml:lang="ro">Afiseaza/Modifica Informatiile Planificare Livrari</value>
         <value xml:lang="ru">Просмотреть/Редактировать информацию по запланированной доставке</value>
@@ -14044,7 +14060,7 @@
         <value xml:lang="fr">Montrer la commande</value>
         <value xml:lang="it">Mostra Ordine</value>
         <value xml:lang="ja">注文を表示</value>
-        <value xml:lang="nl">Bekijk bestelling</value>
+        <value xml:lang="nl">Bekijk order</value>
         <value xml:lang="pt-BR">Visualizar pedido</value>
         <value xml:lang="ro">Afiseaza Comanda</value>
         <value xml:lang="ru">Просмотреть заказ</value>
@@ -14060,7 +14076,7 @@
         <value xml:lang="fr">Voir l'historique de la commande</value>
         <value xml:lang="it">Mostra storia ordine</value>
         <value xml:lang="ja">注文履歴を表示</value>
-        <value xml:lang="nl">Bekijk eerdere bestellingen</value>
+        <value xml:lang="nl">Bekijk eerdere orders</value>
         <value xml:lang="pt-BR">Visualizar histórico de pedido</value>
         <value xml:lang="vi">Xem lịch sử đặt hàng</value>
         <value xml:lang="zh">浏览订单历史</value>
@@ -14126,7 +14142,7 @@
         <value xml:lang="fr">Montrer la demande</value>
         <value xml:lang="it">Mostra Richiesta</value>
         <value xml:lang="ja">リクエストを表示</value>
-        <value xml:lang="nl">View Request</value>
+        <value xml:lang="nl">Bekijk verzoek</value>
         <value xml:lang="pt-BR">Visualizar solicitação</value>
         <value xml:lang="ro">Afiseaza Cererea</value>
         <value xml:lang="ru">Просмотреть запрос</value>
@@ -14142,6 +14158,7 @@
         <value xml:lang="fr">Vu</value>
         <value xml:lang="it">Visionato</value>
         <value xml:lang="ja">表示</value>
+        <value xml:lang="nl">Gezien</value>
         <value xml:lang="pt-BR">Visualizado</value>
         <value xml:lang="vi">Đã xem</value>
         <value xml:lang="zh">已浏览</value>
@@ -14171,7 +14188,7 @@
         <value xml:lang="fr">Approbations en attente</value>
         <value xml:lang="it">In Attesa di Approvazione</value>
         <value xml:lang="ja">承認待ち</value>
-        <value xml:lang="nl">Waiting Approval</value>
+        <value xml:lang="nl">Wachtend op toestemming</value>
         <value xml:lang="pt-BR">Aguardando aprovação</value>
         <value xml:lang="ro">In Asteptarea de Aprovare</value>
         <value xml:lang="ru">Ожидание утверждения</value>
@@ -14188,7 +14205,7 @@
         <value xml:lang="fr">Achèvements en attente</value>
         <value xml:lang="it">In Attesa di Completamento</value>
         <value xml:lang="ja">完了待ち</value>
-        <value xml:lang="nl">Waiting Completion</value>
+        <value xml:lang="nl">Wachtend op afronding</value>
         <value xml:lang="pt-BR">Aguardando conclusão</value>
         <value xml:lang="ro">In Asteptare de Completare</value>
         <value xml:lang="ru">Ожидание завершения</value>
@@ -14205,7 +14222,7 @@
         <value xml:lang="fr">Paiements en attente</value>
         <value xml:lang="it">In Attesa di Pagamento</value>
         <value xml:lang="ja">支払待ち</value>
-        <value xml:lang="nl">Waiting Payment</value>
+        <value xml:lang="nl">Wachtend op betaling</value>
         <value xml:lang="pt-BR">Aguardando pagamento</value>
         <value xml:lang="ro">In Asteptare de Plata</value>
         <value xml:lang="ru">Ожидание оплаты</value>
@@ -14222,6 +14239,7 @@
         <value xml:lang="fr">Site web</value>
         <value xml:lang="it">Sito web</value>
         <value xml:lang="ja">Webサイト</value>
+        <value xml:lang="nl">Website</value>
         <value xml:lang="pt-BR">Site web</value>
         <value xml:lang="th">เว็บไซต์</value>
         <value xml:lang="vi">Trang thông tin</value>
@@ -14235,6 +14253,7 @@
         <value xml:lang="fr">Pesée</value>
         <value xml:lang="it">Misura peso</value>
         <value xml:lang="ja">重量の単位</value>
+        <value xml:lang="nl">Gewicht measurement</value>
         <value xml:lang="pt-BR">Medida de peso</value>
         <value xml:lang="th">หน่วยวัดน้ำหนัก</value>
         <value xml:lang="vi">Đơn vị tính cân nặng</value>
@@ -14251,7 +14270,7 @@
         <value xml:lang="hi-IN">माल कहाँ भेजें</value>
         <value xml:lang="it">Dove vuoi spedire </value>
         <value xml:lang="ja">どこに発送しますか</value>
-        <value xml:lang="nl">Waarheen zullen we het sturen?</value>
+        <value xml:lang="nl">Waarheen versturen?</value>
         <value xml:lang="pt-BR">Para onde devemos enviá-lo</value>
         <value xml:lang="pt-PT">Onde vamos enviá-lo(a)</value>
         <value xml:lang="ro">Unde vrei sa expediezi </value>
@@ -14268,7 +14287,7 @@
         <value xml:lang="fr">avec le code promo.</value>
         <value xml:lang="it">con Codice</value>
         <value xml:lang="ja">コード:</value>
-        <value xml:lang="nl">with Code</value>
+        <value xml:lang="nl">met Code</value>
         <value xml:lang="pt-BR">com código</value>
         <value xml:lang="ro">cu Cod</value>
         <value xml:lang="ru">с кодом</value>
@@ -14284,6 +14303,7 @@
         <value xml:lang="fr">Besoins</value>
         <value xml:lang="it">Fabbisogni</value>
         <value xml:lang="ja">要求</value>
+        <value xml:lang="nl">Requirement</value>
         <value xml:lang="pt-BR">Requisitos</value>
         <value xml:lang="vi">Yêu cầu Nguồn lực</value>
         <value xml:lang="zh">需求</value>
@@ -14331,7 +14351,7 @@
         <value xml:lang="hi-IN">हाँ, यह उपहार है</value>
         <value xml:lang="it">Si, è un omaggio</value>
         <value xml:lang="ja">はい、ギフトです</value>
-        <value xml:lang="nl">Inderdaad, het is een geschenk</value>
+        <value xml:lang="nl">Ja, het is een geschenk</value>
         <value xml:lang="pt-BR">Sim, e um presente</value>
         <value xml:lang="ro">Da, Este un Omagiu</value>
         <value xml:lang="ru">Да, это подарок</value>
@@ -14695,7 +14715,7 @@
         <value xml:lang="fr">Rechercher un ou des entêtes de commande</value>
         <value xml:lang="it">Ricerca Testate Ordini</value>
         <value xml:lang="ja">注文ヘッダを検索</value>
-        <value xml:lang="nl">Lookup Bestelling Header</value>
+        <value xml:lang="nl">Lookup Order Header</value>
         <value xml:lang="pt-BR">Buscar cabeçalho de pedido</value>
         <value xml:lang="ro">Cauta Antet Comenzi</value>
         <value xml:lang="ru">Найзи оглавление заказа</value>
@@ -14711,7 +14731,7 @@
         <value xml:lang="fr">Rechercher un ou des entêtes de commande et infos d'expédition</value>
         <value xml:lang="it">Ricerca Testate Ordini e Informazioni Spedizioni</value>
         <value xml:lang="ja">注文ヘッダおよび発送情報を検索</value>
-        <value xml:lang="nl">Lookup Bestelling Header and Ship Info</value>
+        <value xml:lang="nl">Lookup Order Header and Ship Info</value>
         <value xml:lang="pt-BR">Buscar cabeçalho de pedido e informações de envio</value>
         <value xml:lang="ro">Cauta Antet Comenzi si Informatii Expedieri</value>
         <value xml:lang="ru">Найти оглавление заказа и информацию о поставке</value>
@@ -14727,7 +14747,7 @@
         <value xml:lang="fr">Rechercher un ou des entêtes commandes d'achat et infos d'expédition</value>
         <value xml:lang="it">Ricerca Testate Ordini Acquisto e Informazioni Spedizioni</value>
         <value xml:lang="ja">購買注文ヘッダおよび発送情報を検索</value>
-        <value xml:lang="nl">Lookup Purchase Bestelling Header and Ship Info</value>
+        <value xml:lang="nl">Lookup Purchase Order Header and Ship Info</value>
         <value xml:lang="pt-BR">Buscar cabeçalho de pedido de venda e informação de envio</value>
         <value xml:lang="ro">Cauta Antete Comenzi de Cumparare si Informatii Expedieri </value>
         <value xml:lang="ru">Найти оглавление закупочного заказа и информацию о поставке</value>
@@ -14825,7 +14845,7 @@
         <value xml:lang="fr">Initialisation de commande</value>
         <value xml:lang="it">Inserimento ordine</value>
         <value xml:lang="ja">注文初期化</value>
-        <value xml:lang="nl">Bestelling initialiseren</value>
+        <value xml:lang="nl">Order initialiseren</value>
         <value xml:lang="pt-BR">Inicialização de pedido</value>
         <value xml:lang="ro">Introducere Comanda</value>
         <value xml:lang="ru">Начальный заказ</value>
@@ -14967,7 +14987,7 @@
         <value xml:lang="fr">Articles en retours</value>
         <value xml:lang="it">Righe Reso</value>
         <value xml:lang="ja">返品アイテム</value>
-        <value xml:lang="nl">Return Items</value>
+        <value xml:lang="nl">Retour-items</value>
         <value xml:lang="pt-BR">Itens de devolução</value>
         <value xml:lang="ro">Linii Returnari</value>
         <value xml:lang="ru">Позиции возврата</value>
diff --git a/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl b/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
index faa36ee..4cfdae9 100644
--- a/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
+++ b/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
@@ -95,9 +95,9 @@
                             </#if>
                         </div>
                     </td>
-                    <td></td>
                     <td align="right" valign="top">${quoteItem.quantity!}</td>
                     <td align="right" valign="top">${quoteItem.selectedAmount!}</td>
+                    <td></td>
                     <td align="right" valign="top"><@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/></td>
                     <td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAdjustmentAmount isoCode=quote.currencyUomId/></td>
                     <td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAmount isoCode=quote.currencyUomId/></td>
diff --git a/applications/order/widget/ordermgr/FieldLookupForms.xml b/applications/order/widget/ordermgr/FieldLookupForms.xml
index df2fbaa..8b14804 100644
--- a/applications/order/widget/ordermgr/FieldLookupForms.xml
+++ b/applications/order/widget/ordermgr/FieldLookupForms.xml
@@ -425,10 +425,10 @@
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${bsh:isPromo==null}">
             <hyperlink also-hidden="false" target-type="plain" description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')"/>
         </field>
-        <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${bsh:isPromo!=null&amp;&amp;isPromo.equals(&quot;N&quot;)}">
+        <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy: 'N'.equals(isPromo)}">
             <hyperlink also-hidden="false" target-type="plain" description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')"/>
         </field>
-        <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${bsh:isPromo!=null&amp;&amp;isPromo.equals(&quot;Y&quot;)}"><display/></field>
+        <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${groovy: 'Y'.equals(isPromo)}"><display/></field>
         <field name="productId">
             <display-entity entity-name="Product" key-field-name="productId" description="${productId} - ${internalName}"/>
         </field>
diff --git a/applications/order/widget/ordermgr/QuoteForms.xml b/applications/order/widget/ordermgr/QuoteForms.xml
index 73d775c..5fc64b8 100644
--- a/applications/order/widget/ordermgr/QuoteForms.xml
+++ b/applications/order/widget/ordermgr/QuoteForms.xml
@@ -195,13 +195,13 @@
                 <parameter param-name="quoteItemSeqId"/>
             </hyperlink>
         </field>
-        <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${bsh:isPromo!=null&amp;&amp;isPromo.equals(&quot;N&quot;)}">
+        <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy: 'N'.equals(isPromo)}">
             <hyperlink also-hidden="false" description="${quoteItemSeqId}" target="EditQuoteItem">
                 <parameter param-name="quoteId"/>
                 <parameter param-name="quoteItemSeqId"/>
             </hyperlink>
         </field>
-        <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${bsh:isPromo!=null&amp;&amp;isPromo.equals(&quot;Y&quot;)}"><display/></field>
+        <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${groovy: 'Y'.equals(isPromo)}"><display/></field>
         <field name="productId" title="${uiLabelMap.ProductProductId}">
             <display-entity entity-name="Product" key-field-name="productId" description="${productId} - ${internalName}"/>
         </field>
diff --git a/applications/party/config/PartyEntityLabels.xml b/applications/party/config/PartyEntityLabels.xml
index 2cb8bb2..9179040 100644
--- a/applications/party/config/PartyEntityLabels.xml
+++ b/applications/party/config/PartyEntityLabels.xml
@@ -2961,7 +2961,6 @@
         <value xml:lang="hi-IN">प्रबंधक</value>
         <value xml:lang="it">Responsabile</value>
         <value xml:lang="ja">マネージャ</value>
-        <value xml:lang="nl">ManageR</value>
         <value xml:lang="pt-BR">Gerente</value>
         <value xml:lang="ro">Responsabil</value>
         <value xml:lang="ru">Менеджер</value>
diff --git a/applications/product/config/ProductUiLabels.xml b/applications/product/config/ProductUiLabels.xml
index 60253e4..5e23f85 100644
--- a/applications/product/config/ProductUiLabels.xml
+++ b/applications/product/config/ProductUiLabels.xml
@@ -11350,7 +11350,8 @@
         <value xml:lang="zh-TW">操作和分類,用於操作</value>
     </property>
     <property key="ProductActionForRule">
-        <value xml:lang="en">Action For Rule</value>
+        <value xml:lang="en">Actions For Rule</value>
+        <value xml:lang="fr">Actions pour la règle</value>
         <value xml:lang="ja">ルールに対するアクション</value>
         <value xml:lang="vi">Áp dụng cho Chính sách</value>
         <value xml:lang="zh">操作,用于规则</value>
@@ -14510,6 +14511,7 @@
     </property>
     <property key="ProductConditionsForRule">
         <value xml:lang="en">Conditions For Rule</value>
+        <value xml:lang="fr">Conditions pour la règle</value>
         <value xml:lang="ja">ルールに対する条件</value>
         <value xml:lang="vi">Điều kiện cho Luật áp dụng</value>
         <value xml:lang="zh">条件,用于规则</value>
diff --git a/applications/product/testdef/FacilityTest.xml b/applications/product/testdef/FacilityTest.xml
index 8bc64ce..42e5af0 100644
--- a/applications/product/testdef/FacilityTest.xml
+++ b/applications/product/testdef/FacilityTest.xml
@@ -39,8 +39,8 @@
         <entity-xml action="load" entity-xml-url="component://product/testdef/data/IssuanceTestData.xml"/>
     </test-case>
 
-    <test-case case-name="issuance-tests">
+<!--    <test-case case-name="issuance-tests">
         <junit-test-suite class-name="org.ofbiz.shipment.test.IssuanceTest"/>
     </test-case>
-
+-->
 </test-suite>
diff --git a/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl b/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
index 570a278..b76cefc 100644
--- a/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
+++ b/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
@@ -274,7 +274,7 @@
               <td>
                 <div>
                   <b> ${uiLabelMap.ProductAction} ${(productPromoAction.productPromoActionSeqId)!}</b>
-                  <form method="post" action="<@ofbizUrl>updateProductPromoAction</@ofbizUrl>">
+                  <form method="post" action="<@ofbizUrl>updateProductPromoAction</@ofbizUrl>" name="updateProductPromoAction">
                     <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)!}" />
                     <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)!}" />
                     <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)!}" />
@@ -293,8 +293,11 @@
                     <input type="hidden" name="orderAdjustmentTypeId" value="${(productPromoAction.orderAdjustmentTypeId)!}" />
                     ${uiLabelMap.ProductQuantity}:&nbsp;<input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)!}" />
                     ${uiLabelMap.ProductAmount}:&nbsp;<input type="text" size="5" name="amount" value="${(productPromoAction.amount)!}" />
-                    ${uiLabelMap.ProductItemId}:&nbsp;<input type="text" size="15" name="productId" value="${(productPromoAction.productId)!}" />
-                    ${uiLabelMap.PartyParty}:&nbsp;<input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)!}" /><br />
+                    <br/>
+                    ${uiLabelMap.ProductItemId}:&nbsp;<@htmlTemplate.lookupField value="${(productPromoAction.productId)!}" formName="updateProductPromoAction" name="productId" id="productId" fieldFormName="LookupProduct"/>
+                    <br/>
+                    ${uiLabelMap.PartyParty}:&nbsp;<@htmlTemplate.lookupField value="${(productPromoAction.partyId)!}" formName="updateProductPromoAction" name="partyId" id="partyId" fieldFormName="LookupUserLoginAndPartyDetails"/>
+                    <br/>
                     ${uiLabelMap.ProductServiceName}:&nbsp;<input type="text" size="20" name="serviceName" value="${(productPromoAction.serviceName)!}" />
                     ${uiLabelMap.UseCartQuantity}:&nbsp;
                     <select name="useCartQuantity">
@@ -388,7 +391,7 @@
         <div>${uiLabelMap.ProductNoActionProducts}</div>
       </#if>
                 <div>
-                  <form method="post" action="<@ofbizUrl>createProductPromoProduct</@ofbizUrl>" name="createProductPromoProductActions">>
+                  <form method="post" action="<@ofbizUrl>createProductPromoProduct</@ofbizUrl>" name="createProductPromoProductActions">
                     <input type="hidden" name="productPromoId" value="${productPromoId}" />
                     <input type="hidden" name="productPromoRuleId" value="${productPromoAction.productPromoRuleId}" />
                     <input type="hidden" name="productPromoActionSeqId" value="${productPromoAction.productPromoActionSeqId}" />
@@ -415,7 +418,7 @@
             <tr>
               <td colspan="3">
                 <div>
-                  <form method="post" action="<@ofbizUrl>createProductPromoAction</@ofbizUrl>">
+                  <form method="post" action="<@ofbizUrl>createProductPromoAction</@ofbizUrl>" name="createProductPromoAction">
                     <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)!}" />
                     <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)!}" />
                     <span class="label"><b>${uiLabelMap.CommonNew}:</b>&nbsp;</span>
@@ -427,8 +430,11 @@
                     <input type="hidden" name="orderAdjustmentTypeId" value="PROMOTION_ADJUSTMENT" />
                     ${uiLabelMap.ProductQuantity}:&nbsp;<input type="text" size="5" name="quantity" />
                     ${uiLabelMap.ProductAmount}:&nbsp;<input type="text" size="5" name="amount" />
-                    ${uiLabelMap.ProductItemId}:&nbsp;<input type="text" size="15" name="productId" />
-                    ${uiLabelMap.PartyParty}:&nbsp;<input type="text" size="10" name="partyId" /><br />
+                    <br/>
+                    ${uiLabelMap.ProductItemId}:<@htmlTemplate.lookupField formName="createProductPromoAction" name="productId" id="productId" fieldFormName="LookupProduct"/>
+                    <br/>
+                    ${uiLabelMap.PartyParty}:&nbsp;<@htmlTemplate.lookupField formName="createProductPromoAction" name="partyId" id="partyId" fieldFormName="LookupUserLoginAndPartyDetails"/>
+                    <br/>
                     ${uiLabelMap.ProductServiceName}:&nbsp;<input type="text" size="20" name="serviceName" />
                     ${uiLabelMap.UseCartQuantity}:&nbsp;
                     <select name="useCartQuantity">
diff --git a/applications/product/widget/catalog/ProductScreens.xml b/applications/product/widget/catalog/ProductScreens.xml
index b6f6e89..c3c5cae 100644
--- a/applications/product/widget/catalog/ProductScreens.xml
+++ b/applications/product/widget/catalog/ProductScreens.xml
@@ -34,7 +34,7 @@
                 <entity-one entity-name="Product" value-field="product"/>
                 <set field="product" from-field="product" global="true"/>
                 <set field="ecomLink" value="${groovy: product.internalName.replace(' ', org.ofbiz.product.category.ftl.CatalogUrlSeoTransform.URL_HYPHEN) 
-                    + org.ofbiz.product.category.ftl.CatalogUrlSeoTransform.URL_HYPHEN + productId + '.html'}"/>                
+                    + org.ofbiz.product.category.ftl.CatalogUrlSeoTransform.URL_HYPHEN + productId + '.html'}"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
diff --git a/framework/common/config/CommonEntityLabels.xml b/framework/common/config/CommonEntityLabels.xml
index 94252d3..ded803d 100644
--- a/framework/common/config/CommonEntityLabels.xml
+++ b/framework/common/config/CommonEntityLabels.xml
@@ -68,7 +68,7 @@
         <value xml:lang="zh-TW">用於線性元件的材料清單公式</value>
     </property>
     <property key="CustomMethod.description.DBL_DECL_DEP_FORMULA">
-        <value xml:lang="en">Double decline depreciatiion algorithm for fixed asset((NetBookValue - salvageCost)*2/remainingLifeInYears)</value>
+        <value xml:lang="en">Double decline depreciation algorithm for fixed asset((NetBookValue - salvageCost)*2/remainingLifeInYears)</value>
         <value xml:lang="fr">Algorithme de dépréciation d'immobilisation ((valeur - coût déjà déprécié)*2/ années restantes)</value>
         <value xml:lang="it">Declina algoritmo doppio svalutazione per cespiti((NetBookValue - salvageCost)*2/remainingLifeInYears)</value>
         <value xml:lang="ja">固定資産減価償却 二倍定率法((正味簿価 - 残存価額)*2/耐用年数残)</value>
@@ -316,6 +316,7 @@
         <value xml:lang="fr">Entrée d'espèces dans la caisse</value>
         <value xml:lang="it">Contanti messi in cassa</value>
         <value xml:lang="ja">小口現金引出</value>
+        <value xml:lang="nl">Kleine kas - uitgave</value>
         <value xml:lang="pt-BR">Dinheiro de caixa pago pelo balcão</value>
         <value xml:lang="ru">Введите деньги в кассе</value>
         <value xml:lang="vi">Lý do NỘP vào két</value>
@@ -328,6 +329,7 @@
         <value xml:lang="fr">Sortie d'espèces de la caisse</value>
         <value xml:lang="it">Contanti usciti dalla cassa</value>
         <value xml:lang="ja">小口現金支払</value>
+        <value xml:lang="nl">Kleine kas - ontvangst</value>
         <value xml:lang="pt-BR">Valor descontado do caixa</value>
         <value xml:lang="ru">Остаток денежных средств на счету</value>
         <value xml:lang="vi">Lý do RÚT từ két</value>
@@ -340,6 +342,7 @@
         <value xml:lang="fr">Monnaie ajoutée à l'encours de caisse</value>
         <value xml:lang="it">Cambio aggiunti alla cassa</value>
         <value xml:lang="ja">小口現金変更追加</value>
+        <value xml:lang="nl">Kleine kas - wisselgeld in</value>
         <value xml:lang="pt-BR">Alterar adicionado fluxo do balcão</value>
         <value xml:lang="ru">Добавленные деньги к наличным</value>
         <value xml:lang="vi">Thiết lập hướng THÊM vào két</value>
@@ -352,6 +355,7 @@
         <value xml:lang="fr">Niveau Bronze</value>
         <value xml:lang="it">Bronzo</value>
         <value xml:lang="ja">ブロンズ</value>
+        <value xml:lang="nl">Niveau - brons</value>
         <value xml:lang="pt-BR">Nível bronze</value>
         <value xml:lang="th">บรอนซ์</value>
         <value xml:lang="ru">Бронзовая</value>
@@ -365,6 +369,7 @@
         <value xml:lang="fr">Niveau Or</value>
         <value xml:lang="it">Oro</value>
         <value xml:lang="ja">ゴールド</value>
+        <value xml:lang="nl">Niveau - goud</value>
         <value xml:lang="pt-BR">Nível Ouro</value>
         <value xml:lang="th">ทอง</value>
         <value xml:lang="ru">Золотая</value>
@@ -378,6 +383,7 @@
         <value xml:lang="fr">Non applicable</value>
         <value xml:lang="it">Non applicabile</value>
         <value xml:lang="ja">適用外</value>
+        <value xml:lang="nl">Niet beschikbaar/niet van toepassing</value>
         <value xml:lang="pt-BR">Não se aplica</value>
         <value xml:lang="th">ไม่เหมาะสม</value>
         <value xml:lang="ru">Не применяется</value>
@@ -391,6 +397,7 @@
         <value xml:lang="fr">Niveau argent</value>
         <value xml:lang="it">Argento</value>
         <value xml:lang="ja">シルバー</value>
+        <value xml:lang="nl">Niveau - zilver</value>
         <value xml:lang="pt-BR">Nivel Prata</value>
         <value xml:lang="th">เงิน</value>
         <value xml:lang="ru">Серебрянная</value>
@@ -405,6 +412,7 @@
         <value xml:lang="fr">Coût moyen</value>
         <value xml:lang="it">Costo medio</value>
         <value xml:lang="ja">平均コスト</value>
+        <value xml:lang="nl">Kosten verkoop - gemiddelde kosten</value>
         <value xml:lang="pt">Custo Médio</value>
         <value xml:lang="ro">Cost Mediu</value>
         <value xml:lang="ru">По средней стоимости</value>
@@ -420,6 +428,7 @@
         <value xml:lang="fr">FIFO (premier entré, premier sorti)</value>
         <value xml:lang="it">FIFO</value>
         <value xml:lang="ja">先入先出法(FIFO)</value>
+        <value xml:lang="nl">Kosten verkoop - FIFO</value>
         <value xml:lang="pt">FIFO</value>
         <value xml:lang="pt-BR">FIFO (primeiro a entrar, primeiro a sair)</value>
         <value xml:lang="ro">FIFO</value>
@@ -436,6 +445,7 @@
         <value xml:lang="fr">LIFO (Dernier entré, premier sorti)</value>
         <value xml:lang="it">LIFO</value>
         <value xml:lang="ja">後入先出法(LIFO)</value>
+        <value xml:lang="nl">Kosten verkoop - LIFO</value>
         <value xml:lang="pt">LIFO</value>
         <value xml:lang="pt-BR">LIFO (Último a entrar, primeiro a sair)</value>
         <value xml:lang="ro">LIFO</value>
@@ -521,6 +531,7 @@
         <value xml:lang="fr">Bateau</value>
         <value xml:lang="it">Barca</value>
         <value xml:lang="ja">船舶</value>
+        <value xml:lang="nl">Boot/schip</value>
         <value xml:lang="pt">Boat</value>
         <value xml:lang="pt-BR">Barco</value>
         <value xml:lang="ro">Barca</value>
@@ -537,6 +548,7 @@
         <value xml:lang="fr">Compresseur</value>
         <value xml:lang="it">Compressore</value>
         <value xml:lang="ja">コンプレッサ</value>
+        <value xml:lang="nl">Compressor</value>
         <value xml:lang="pt">Compressor</value>
         <value xml:lang="ro">Compresor</value>
         <value xml:lang="ru">Компрессор</value>
@@ -552,6 +564,7 @@
         <value xml:lang="fr">Pelleteuse</value>
         <value xml:lang="it">Escavatore</value>
         <value xml:lang="ja">掘削機</value>
+        <value xml:lang="nl">Graver</value>
         <value xml:lang="pt">Digger</value>
         <value xml:lang="pt-BR">Escavador</value>
         <value xml:lang="ro">Escavator</value>
@@ -568,6 +581,7 @@
         <value xml:lang="fr">Chariot élévateur à fourche</value>
         <value xml:lang="it">Carrello elevatore</value>
         <value xml:lang="ja">フォークリフト</value>
+        <value xml:lang="nl">Heftruck</value>
         <value xml:lang="pt">Forklift</value>
         <value xml:lang="pt-BR">Empilhadeira</value>
         <value xml:lang="ro">Car Elevator</value>
@@ -584,6 +598,7 @@
         <value xml:lang="fr">Ascenseur</value>
         <value xml:lang="it">Ascensore</value>
         <value xml:lang="ja">昇降機</value>
+        <value xml:lang="nl">Personenlift</value>
         <value xml:lang="pt">Manlift</value>
         <value xml:lang="ro">Ascensor</value>
         <value xml:lang="ru">Подъемник</value>
@@ -599,6 +614,7 @@
         <value xml:lang="fr">Mobile</value>
         <value xml:lang="it">Mobile</value>
         <value xml:lang="ja">自動車</value>
+        <value xml:lang="nl">Mobiele telefoon</value>
         <value xml:lang="pt">Mobile</value>
         <value xml:lang="ro">Mobile</value>
         <value xml:lang="ru">Мобильный</value>
@@ -614,6 +630,7 @@
         <value xml:lang="fr">Passager du véhicule</value>
         <value xml:lang="it">Passeggero veicolo</value>
         <value xml:lang="ja">乗用車</value>
+        <value xml:lang="nl">Voertuig - personen</value>
         <value xml:lang="pt">Passneger Vehicle</value>
         <value xml:lang="pt-BR">Veículo de passageiros</value>
         <value xml:lang="ro">Vehicol Paseger </value>
@@ -629,6 +646,7 @@
         <value xml:lang="fr">Extracteur</value>
         <value xml:lang="it">Tenditore</value>
         <value xml:lang="ja">牽引車</value>
+        <value xml:lang="nl">Voertuig - trekker</value>
         <value xml:lang="pt">Puller</value>
         <value xml:lang="pt-BR">Puxador</value>
         <value xml:lang="ro">Puller</value>
@@ -659,6 +677,7 @@
         <value xml:lang="fr">Organisme de services</value>
         <value xml:lang="it">Servizio corpo</value>
         <value xml:lang="ja">サービスボディ</value>
+        <value xml:lang="nl">Service entiteit</value>
         <value xml:lang="pt">Service Body</value>
         <value xml:lang="pt-BR">Corpo de Serviço</value>
         <value xml:lang="ro">Serviciu Corp</value>
@@ -675,6 +694,7 @@
         <value xml:lang="fr">Camion citerne</value>
         <value xml:lang="it">Cisterna</value>
         <value xml:lang="ja">タンカー</value>
+        <value xml:lang="nl">Tanker</value>
         <value xml:lang="pt">Tanker</value>
         <value xml:lang="pt-BR">Petroleiro</value>
         <value xml:lang="ro">Cisterna</value>
@@ -691,6 +711,7 @@
         <value xml:lang="fr">Tracteur</value>
         <value xml:lang="it">Trattore</value>
         <value xml:lang="ja">トラクター</value>
+        <value xml:lang="nl">Tractor</value>
         <value xml:lang="pt">Tractor</value>
         <value xml:lang="pt-BR">Trator</value>
         <value xml:lang="ro">Tractor</value>
@@ -707,6 +728,7 @@
         <value xml:lang="fr">Tranchoir</value>
         <value xml:lang="it">Trinciatore</value>
         <value xml:lang="ja">トレンチャー(溝堀)</value>
+        <value xml:lang="nl">Sleuvengraver</value>
         <value xml:lang="pt">Trencher</value>
         <value xml:lang="pt-BR">Trincho</value>
         <value xml:lang="ro">Trancher</value>
@@ -723,6 +745,7 @@
         <value xml:lang="fr">Canal de vente : fax</value>
         <value xml:lang="it">Canale fax</value>
         <value xml:lang="ja">FAXチャネル</value>
+        <value xml:lang="nl">Verkoopkanaal: fax</value>
         <value xml:lang="pt">Canal Fax</value>
         <value xml:lang="pt-BR">Canal de Fax</value>
         <value xml:lang="ro">Canal Fax</value>
@@ -739,6 +762,7 @@
         <value xml:lang="fr">Masse (ou volume)</value>
         <value xml:lang="it">Giacenza</value>
         <value xml:lang="ja">バルク</value>
+        <value xml:lang="nl">Bulk</value>
         <value xml:lang="pt">Parte de Edifício</value>
         <value xml:lang="pt-BR">Granel</value>
         <value xml:lang="ro">Stoc</value>
@@ -755,6 +779,7 @@
         <value xml:lang="fr">Choix/Primaire</value>
         <value xml:lang="it">Prelievo/Primaria</value>
         <value xml:lang="ja">ピッキング/最初</value>
+        <value xml:lang="nl">Pick locatie</value>
         <value xml:lang="pt">Recolher/Primária</value>
         <value xml:lang="pt-BR">Escolha/Primária</value>
         <value xml:lang="ro">Preluare/Primara</value>
@@ -796,6 +821,7 @@
         <value xml:lang="fr">AEROSPACIATIALE</value>
         <value xml:lang="it">Spazio aereo</value>
         <value xml:lang="ja">航空宇宙産業</value>
+        <value xml:lang="nl">Ruimtevaart</value>
         <value xml:lang="pt-BR">Espaço aéreo</value>
         <value xml:lang="ru">Воздушное пространство</value>
         <value xml:lang="th">บรรยากาศ</value>
@@ -809,6 +835,7 @@
         <value xml:lang="fr">DISTRIBUTION</value>
         <value xml:lang="it">In distribuzione</value>
         <value xml:lang="ja">物流業</value>
+        <value xml:lang="nl">Distributie</value>
         <value xml:lang="pt-BR">Distribuição</value>
         <value xml:lang="ru">Распределение</value>
         <value xml:lang="th">การกระจาย</value>
@@ -822,6 +849,7 @@
         <value xml:lang="fr">FINANCE</value>
         <value xml:lang="it">Finanza</value>
         <value xml:lang="ja">金融業</value>
+        <value xml:lang="nl">Finance</value>
         <value xml:lang="pt-BR">Financeira</value>
         <value xml:lang="ru">Финансы</value>
         <value xml:lang="th">การเงิน</value>
@@ -835,6 +863,7 @@
         <value xml:lang="fr">SERVICES GENERAUX</value>
         <value xml:lang="it">Servizi generale</value>
         <value xml:lang="ja">サービス業</value>
+        <value xml:lang="nl">Generieke diensten</value>
         <value xml:lang="pt-BR">Serviços Gerais</value>
         <value xml:lang="ru">Общие услуги</value>
         <value xml:lang="th">IND_GEN_SERVICES</value>
@@ -848,6 +877,7 @@
         <value xml:lang="fr">MATERIEL</value>
         <value xml:lang="it">Hardware</value>
         <value xml:lang="ja">ハードウェア業</value>
+        <value xml:lang="nl">Hardware</value>
         <value xml:lang="pt-BR">Hardware</value>
         <value xml:lang="ru">Аппаратные средства</value>
         <value xml:lang="th">ฮาร์ดแวร์</value>
@@ -861,6 +891,7 @@
         <value xml:lang="fr">SANTE</value>
         <value xml:lang="it">Sicurezza sulla salutea</value>
         <value xml:lang="ja">保健医療業</value>
+        <value xml:lang="nl">Gezondheidzorg</value>
         <value xml:lang="pt-BR">Saúde</value>
         <value xml:lang="ru">Забота о здоровье</value>
         <value xml:lang="th">IND_HEALTH_CARE</value>
@@ -874,6 +905,7 @@
         <value xml:lang="fr">ASSURANCE</value>
         <value xml:lang="it">Assicurazione</value>
         <value xml:lang="ja">保険業</value>
+        <value xml:lang="nl">Verzekeringen</value>
         <value xml:lang="pt-BR">Seguros</value>
         <value xml:lang="ru">Страхование</value>
         <value xml:lang="th">การประกัน</value>
@@ -887,6 +919,7 @@
         <value xml:lang="fr">FABRICATION</value>
         <value xml:lang="it">Produzione</value>
         <value xml:lang="ja">製造業</value>
+        <value xml:lang="nl">Fabricage</value>
         <value xml:lang="pt-BR">Produção</value>
         <value xml:lang="ru">Мануфактура</value>
         <value xml:lang="th">การผลิต</value>
@@ -900,6 +933,7 @@
         <value xml:lang="fr">MEDIA</value>
         <value xml:lang="it">Media</value>
         <value xml:lang="ja">メディア業</value>
+        <value xml:lang="nl">Media</value>
         <value xml:lang="ru">СМИ</value>
         <value xml:lang="th">มีเดีย</value>
         <value xml:lang="vi">Đa phương tiện</value>
@@ -912,6 +946,7 @@
         <value xml:lang="fr">NON LUCRATIF</value>
         <value xml:lang="it">Senza profitto</value>
         <value xml:lang="ja">非営利組織</value>
+        <value xml:lang="nl">Non-profit</value>
         <value xml:lang="pt-BR">Sem fins lucrativos</value>
         <value xml:lang="ru">Бесприбыльный</value>
         <value xml:lang="th">ไม่ผลกำไร</value>
@@ -925,6 +960,7 @@
         <value xml:lang="fr">IMMOBILIER</value>
         <value xml:lang="it">Immobili</value>
         <value xml:lang="ja">不動産業</value>
+        <value xml:lang="nl">Vastgoed</value>
         <value xml:lang="pt-BR">Imobiliária</value>
         <value xml:lang="ru">Собственность</value>
         <value xml:lang="th">บ้านและที่ดิน</value>
@@ -938,6 +974,7 @@
         <value xml:lang="fr">VENTE AU DETAIL</value>
         <value xml:lang="it">Al dettaglio</value>
         <value xml:lang="ja">小売業</value>
+        <value xml:lang="nl">Retail/detaillist</value>
         <value xml:lang="pt-BR">Varejo</value>
         <value xml:lang="ru">Розничный</value>
         <value xml:lang="th">การขายปลีก</value>
@@ -951,6 +988,7 @@
         <value xml:lang="fr">LOGICIEL</value>
         <value xml:lang="it">Software</value>
         <value xml:lang="ja">ソフトウェア業</value>
+        <value xml:lang="nl">Software</value>
         <value xml:lang="pt-BR">Software</value>
         <value xml:lang="ru">ПО</value>
         <value xml:lang="th">ซอฟต์แวร์</value>
@@ -964,6 +1002,7 @@
         <value xml:lang="fr">TELECOM</value>
         <value xml:lang="it">Telefono</value>
         <value xml:lang="ja">電気通信業</value>
+        <value xml:lang="nl">Telecom</value>
         <value xml:lang="pt-BR">Telefonia</value>
         <value xml:lang="ru">Телефония</value>
         <value xml:lang="th">โทรคมนาคม</value>
@@ -978,6 +1017,7 @@
         <value xml:lang="fr">FIFO expiré</value>
         <value xml:lang="it">FIFO scaduto</value>
         <value xml:lang="ja">先入先出法出庫</value>
+        <value xml:lang="nl">FIFO - expiratie</value>
         <value xml:lang="pt">FIFO Expira</value>
         <value xml:lang="pt-BR">FIFO expeira</value>
         <value xml:lang="ro">FIFO Expirat</value>
@@ -994,6 +1034,7 @@
         <value xml:lang="fr">FIFO reçu</value>
         <value xml:lang="it">FIFO ricevuto</value>
         <value xml:lang="ja">先入先出法入庫</value>
+        <value xml:lang="nl">FIFO - ontvangst</value>
         <value xml:lang="pt">FIFO Recebido</value>
         <value xml:lang="ro">FIFO Primit</value>
         <value xml:lang="ru">FIFO получено</value>
@@ -1009,6 +1050,7 @@
         <value xml:lang="fr">Coût supérieur</value>
         <value xml:lang="it">Maggiore del costo unitario</value>
         <value xml:lang="ja">大単位原価</value>
+        <value xml:lang="nl">Kosten - grotere eenheid</value>
         <value xml:lang="pt">Maior Unidade de Custo</value>
         <value xml:lang="pt-BR">Maior custo unitário</value>
         <value xml:lang="ro">Mai mare decat Costul Unitar</value>
@@ -1025,6 +1067,7 @@
         <value xml:lang="fr">LIFO expiré</value>
         <value xml:lang="it">LIFO scaduto</value>
         <value xml:lang="ja">後入先出法出庫</value>
+        <value xml:lang="nl">LIFO - expiratie</value>
         <value xml:lang="pt">LIFO Expira</value>
         <value xml:lang="ro">LIFO Expirat</value>
         <value xml:lang="ru">LIFO окончание срока</value>
@@ -1040,6 +1083,7 @@
         <value xml:lang="fr">LIFO reçu</value>
         <value xml:lang="it">LIFO ricevuto</value>
         <value xml:lang="ja">後入先出法入庫</value>
+        <value xml:lang="nl">LIFO - ontvangst</value>
         <value xml:lang="pt">LIFO Recebido</value>
         <value xml:lang="ro">LIFO Primit</value>
         <value xml:lang="ru">LIFO получено</value>
@@ -1055,6 +1099,7 @@
         <value xml:lang="fr">Coût inférieur</value>
         <value xml:lang="it">Minore del costo unitario</value>
         <value xml:lang="ja">小単位原価</value>
+        <value xml:lang="nl">Kosten - kleinere eenheid</value>
         <value xml:lang="pt">Menor Unidade de Custo</value>
         <value xml:lang="pt-BR">Menor Custo Unitário</value>
         <value xml:lang="ro">Mai mic decat Costul Unitar</value>
@@ -1071,6 +1116,7 @@
         <value xml:lang="fr">Ordre imposé (aucun saut, par organisation)</value>
         <value xml:lang="it">Sequenza forzata (nessuna pausa, per organizzazione)</value>
         <value xml:lang="ja">拡張連番(欠番なし、組織単位)</value>
+        <value xml:lang="nl">Oplopende volgnummers</value>
         <value xml:lang="pt">Sequência Forçada (sem intervalos, por organização)</value>
         <value xml:lang="pt-BR">Seqüência Forçada (sem intervalo, por organização)</value>
         <value xml:lang="ro">Seqventa Fortata (nici-o pauza, pentru organizare)</value>
@@ -1087,6 +1133,7 @@
         <value xml:lang="fr">Reprendre sur l'année fiscale(aucun saut, par organisation, remise à 1 chaque année)</value>
         <value xml:lang="it">Riavvio ad anno fiscale (nessuna pausa, per organizzazione, azzeramento ad ogni anno)</value>
         <value xml:lang="ja">会計年度毎(欠番なし、組織単位、毎年リセット)</value>
+        <value xml:lang="nl">Herstart per fiscaal jaar (start met 1)</value>
         <value xml:lang="pt">Recomeçar no Ano Fiscal (sem intervalos, por org, reset para 1 cada ano)</value>
         <value xml:lang="pt-BR">Reinicie o Ano Fiscal (sem intervalos, por organização, volta para 1 a cada ano)</value>
         <value xml:lang="ro">Restart din Anul Fiscal (nici-o pauza, pentru organizare, azereaza fiecare an)</value>
@@ -1103,6 +1150,7 @@
         <value xml:lang="fr">Standard (plus rapide, des sauts peuvent apparaître, fait par le système)</value>
         <value xml:lang="it">Normale (più veloce, potrebbe esserci pause, per il sistema)</value>
         <value xml:lang="ja">標準(高速、欠番可能性あり、システム単位)</value>
+        <value xml:lang="nl">Standaard nummering (kan gaten hebben, per systeem, maar sneller)</value>
         <value xml:lang="pt">Standard (mais rápido, pode ter intervalos, por sistema)</value>
         <value xml:lang="pt-BR">Padrão (mais rápido, pode ter lacunas, por sistema)</value>
         <value xml:lang="ro">Normal (rapid, posibil sa apara pauze in sistem)</value>
@@ -1145,6 +1193,7 @@
         <value xml:lang="fr">Catégorie d'article</value>
         <value xml:lang="it">Categoria prodotto</value>
         <value xml:lang="ja">製品カテゴリ</value>
+        <value xml:lang="nl">Productcategorie</value>
         <value xml:lang="pt">Categoria do Produto</value>
         <value xml:lang="pt-BR">Categoria de Produtos</value>
         <value xml:lang="ro">Categorie Produs</value>
@@ -1161,6 +1210,7 @@
         <value xml:lang="fr">Produit</value>
         <value xml:lang="it">Prodotto</value>
         <value xml:lang="ja">製品</value>
+        <value xml:lang="nl">Product</value>
         <value xml:lang="pt">Produto</value>
         <value xml:lang="ro">Produs</value>
         <value xml:lang="ru">Продукт</value>
@@ -1292,7 +1342,7 @@
         <value xml:lang="fr">Terme apparenté</value>
         <value xml:lang="it">Termine relativo</value>
         <value xml:lang="ja">関連語</value>
-        <value xml:lang="nl">Related Term</value>
+        <value xml:lang="nl">Soortgelijk begrip</value>
         <value xml:lang="pt">Termo Relacionado</value>
         <value xml:lang="ro">Termen Relativ</value>
         <value xml:lang="ru">Связанные термины</value>
@@ -1308,7 +1358,7 @@
         <value xml:lang="fr">Portée des notes</value>
         <value xml:lang="it">Scopo note</value>
         <value xml:lang="ja">範囲注釈(スコープノート)</value>
-        <value xml:lang="nl">Scope Opmerkingen</value>
+        <value xml:lang="nl">Scope opmerkingen</value>
         <value xml:lang="pt">Notas de Alcance</value>
         <value xml:lang="pt-BR">Nota</value>
         <value xml:lang="ro">Scop Note</value>
@@ -1371,6 +1421,7 @@
         <value xml:lang="fr">Ordre imposé (aucun saut, par organisation)</value>
         <value xml:lang="it">Sequenza forzata (nessuna pausa, per organizzazione)</value>
         <value xml:lang="ja">拡張連番(欠番なし、組織単位)</value>
+        <value xml:lang="nl">Oplopende nummering</value>
         <value xml:lang="pt">Sequência Forçada (sem intervalos, por organização)</value>
         <value xml:lang="pt-BR">Seqüência Forçada (sem intervalos, por organização)</value>
         <value xml:lang="ro">Secventa Fortata (nici-o pauza, pentru organizare)</value>
@@ -1433,6 +1484,7 @@
         <value xml:lang="fr">Crédit</value>
         <value xml:lang="it">Credito</value>
         <value xml:lang="ja">信用</value>
+        <value xml:lang="nl">Credit</value>
         <value xml:lang="pt">Creditar</value>
         <value xml:lang="pt-BR">Crédito</value>
         <value xml:lang="ro">Credit</value>
@@ -1449,6 +1501,7 @@
         <value xml:lang="fr">Remboursement</value>
         <value xml:lang="it">Rimborso</value>
         <value xml:lang="ja">返済</value>
+        <value xml:lang="nl">Terugstorting</value>
         <value xml:lang="pt">Reembolsar</value>
         <value xml:lang="pt-BR">Reembolso</value>
         <value xml:lang="ro">Rambursare</value>
@@ -1481,6 +1534,7 @@
         <value xml:lang="fr">Canal de vente : téléphonique</value>
         <value xml:lang="it">Canale telefonico</value>
         <value xml:lang="ja">電話チャネル</value>
+        <value xml:lang="nl">Verkoopkanaal - telefonisch</value>
         <value xml:lang="pt">Canal Telefone</value>
         <value xml:lang="pt-BR">Canal de Telefone</value>
         <value xml:lang="ro">Canal Telefon</value>
@@ -1513,6 +1567,7 @@
         <value xml:lang="fr">Coût et frêt</value>
         <value xml:lang="it">Costo e spese di trasporto</value>
         <value xml:lang="ja">原価および運送費用</value>
+        <value xml:lang="nl">Kosten en vracht</value>
         <value xml:lang="pt">Cost and Freight</value>
         <value xml:lang="pt-BR">Custo e frete</value>
         <value xml:lang="ro">Cost si Cheltuieli de Trasport</value>
@@ -1733,6 +1788,7 @@
         <value xml:lang="fr">En transit</value>
         <value xml:lang="it">In transito</value>
         <value xml:lang="ja">運送中</value>
+        <value xml:lang="nl">In transit</value>
         <value xml:lang="pt">Em Trânsito</value>
         <value xml:lang="ro">In Tranzit</value>
         <value xml:lang="ru">Во время транзита</value>
@@ -1747,6 +1803,7 @@
         <value xml:lang="fr">Origine</value>
         <value xml:lang="it">Origine</value>
         <value xml:lang="ja">出発地</value>
+        <value xml:lang="nl">Origine/herkomst</value>
         <value xml:lang="pt">Origem</value>
         <value xml:lang="ro">Origine</value>
         <value xml:lang="ru">В пункте отправки</value>
@@ -1762,6 +1819,7 @@
         <value xml:lang="fr">Est</value>
         <value xml:lang="it">E'</value>
         <value xml:lang="ja">=</value>
+        <value xml:lang="nl">is gelijk aan</value>
         <value xml:lang="pt">É</value>
         <value xml:lang="ro">Este</value>
         <value xml:lang="ru">это</value>
@@ -1777,6 +1835,7 @@
         <value xml:lang="fr">Est plus grand que</value>
         <value xml:lang="it">E' maggiore di</value>
         <value xml:lang="ja">></value>
+        <value xml:lang="nl">Groter dan</value>
         <value xml:lang="pt">É Maior Que</value>
         <value xml:lang="ro">E Mai mare decat</value>
         <value xml:lang="ru">больше</value>
@@ -1792,6 +1851,7 @@
         <value xml:lang="fr">Est plus grand ou égal  à</value>
         <value xml:lang="it">E' maggiore di o uguale a</value>
         <value xml:lang="ja">≧</value>
+        <value xml:lang="nl">Groter of gelijk aan</value>
         <value xml:lang="pt">É Maior ou Igual A</value>
         <value xml:lang="ro">E Mai mare sau Egal cu</value>
         <value xml:lang="ru">больше или равно</value>
@@ -1807,6 +1867,7 @@
         <value xml:lang="fr">Est plus petit que</value>
         <value xml:lang="it">E' minore di</value>
         <value xml:lang="ja"><</value>
+        <value xml:lang="nl">Kleiner dan</value>
         <value xml:lang="pt">É Menos Que</value>
         <value xml:lang="ro">E Mai mic decat</value>
         <value xml:lang="ru">меньше</value>
@@ -1822,6 +1883,7 @@
         <value xml:lang="fr">Est plus petit ou égal à</value>
         <value xml:lang="it">E' minore di o uguale a</value>
         <value xml:lang="ja">≦</value>
+        <value xml:lang="nl">Kleiner of gelijk aan</value>
         <value xml:lang="pt">É Menos Que ou Igual A</value>
         <value xml:lang="pt-BR">É inferior ou igual a</value>
         <value xml:lang="ro">E Mai mic sau egal cu</value>
@@ -1838,6 +1900,7 @@
         <value xml:lang="fr">N'est pas</value>
         <value xml:lang="it">Non e'</value>
         <value xml:lang="ja">≠</value>
+        <value xml:lang="nl">Niet gelijk aan</value>
         <value xml:lang="pt">Não É</value>
         <value xml:lang="ro">Nu Este</value>
         <value xml:lang="ru">не</value>
@@ -1869,6 +1932,7 @@
         <value xml:lang="fr">Sous-total du panier</value>
         <value xml:lang="it">Sub-totale carrello</value>
         <value xml:lang="ja">買い物かご小計</value>
+        <value xml:lang="nl">Sub-totaal winkelmand</value>
         <value xml:lang="pt">Sub-total do Carrinho</value>
         <value xml:lang="ro">Sub-total Cos</value>
         <value xml:lang="ru">Итог корзины</value>
@@ -2221,6 +2285,7 @@
         <value xml:lang="fr">Enregistrement</value>
         <value xml:lang="it">Registrazione</value>
         <value xml:lang="ja">登録</value>
+        <value xml:lang="nl">Registratie</value>
         <value xml:lang="pt">Registo</value>
         <value xml:lang="pt-BR">Registro</value>
         <value xml:lang="ro">Registratura</value>
@@ -2237,6 +2302,7 @@
         <value xml:lang="fr">Achat d'une carte-cadeau</value>
         <value xml:lang="it">Acquisto carta-omaggio</value>
         <value xml:lang="ja">ギフトカードの支払</value>
+        <value xml:lang="nl">Aankoop/verkoop cadeaukaart</value>
         <value xml:lang="pt">Compra de Cartão-de-Oferta</value>
         <value xml:lang="pt-BR">Compra de cartão de presente Card</value>
         <value xml:lang="ro">Cumpara Carte-Omagiu</value>
@@ -2269,6 +2335,7 @@
         <value xml:lang="fr">Commande en attente</value>
         <value xml:lang="it">Back-Order</value>
         <value xml:lang="ja">入荷待ち</value>
+        <value xml:lang="nl">Back order</value>
         <value xml:lang="pt">Encomenda em Aberto</value>
         <value xml:lang="pt-BR">Pedido em aberto-</value>
         <value xml:lang="ro">Back-Order</value>
@@ -2285,6 +2352,7 @@
         <value xml:lang="fr">Changement de commande</value>
         <value xml:lang="it">Cambio ordine</value>
         <value xml:lang="ja">注文変更</value>
+        <value xml:lang="nl">Order - gewijzigd</value>
         <value xml:lang="pt">Alteração de Encomenda</value>
         <value xml:lang="pt-BR">Alteração de Pedido</value>
         <value xml:lang="ro">Schimb Comanda</value>
@@ -2301,6 +2369,7 @@
         <value xml:lang="fr">Accompli</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Compleet</value>
         <value xml:lang="pt">Completo</value>
         <value xml:lang="ro">Executat</value>
         <value xml:lang="ru">Завершение</value>
@@ -2316,6 +2385,7 @@
         <value xml:lang="fr">Confirmation</value>
         <value xml:lang="it">Conferma</value>
         <value xml:lang="ja">確認</value>
+        <value xml:lang="nl">Bevestiging</value>
         <value xml:lang="pt">Confirmação</value>
         <value xml:lang="ro">Confirma</value>
         <value xml:lang="ru">Подтверждение</value>
@@ -2500,6 +2570,7 @@
         <value xml:lang="fr">Confirmation de devis</value>
         <value xml:lang="it">Conferma preventivo</value>
         <value xml:lang="ja">見積確認</value>
+        <value xml:lang="nl">Quote - bevestiging</value>
         <value xml:lang="pt">Confirmação de Quotação</value>
         <value xml:lang="pt-BR">Confirmação de cotação</value>
         <value xml:lang="ro">Confirma Oferta</value>
@@ -2515,6 +2586,7 @@
         <value xml:lang="fr">Devis créé</value>
         <value xml:lang="it">Creazione preventivo</value>
         <value xml:lang="ja">見積作成</value>
+        <value xml:lang="nl">Quote - aangemaakt</value>
         <value xml:lang="pt-BR">Cotação criada</value>
         <value xml:lang="ru">Цена создана</value>
         <value xml:lang="vi">Tạo báo giá</value>
@@ -2528,6 +2600,7 @@
         <value xml:lang="fr">Retour accepté</value>
         <value xml:lang="it">Reso accettato</value>
         <value xml:lang="ja">返品受付</value>
+        <value xml:lang="nl">Quote - geaccepteerd</value>
         <value xml:lang="pt">Devolução Aceite</value>
         <value xml:lang="pt-BR">Devoluução aceita</value>
         <value xml:lang="ro">Acces Returnare</value>
@@ -2544,6 +2617,7 @@
         <value xml:lang="fr">Retour annulé</value>
         <value xml:lang="it">Reso cancellato</value>
         <value xml:lang="ja">返品取消</value>
+        <value xml:lang="nl">Retour - geannuleerd</value>
         <value xml:lang="pt">Devolução Cancelada</value>
         <value xml:lang="ro">Returnare Stearsa</value>
         <value xml:lang="ru">Отмена возврата</value>
@@ -2559,6 +2633,7 @@
         <value xml:lang="fr">Retour Accompli</value>
         <value xml:lang="it">Reso completato</value>
         <value xml:lang="ja">返品完了</value>
+        <value xml:lang="nl">Retour - afgerond</value>
         <value xml:lang="pt">Devolução Completa</value>
         <value xml:lang="pt-BR">Devolução completada</value>
         <value xml:lang="ro">Returnare Executata</value>
@@ -2574,6 +2649,7 @@
         <value xml:lang="fr">Le dire à un ami</value>
         <value xml:lang="it">Dillo ad un'amico</value>
         <value xml:lang="ja">友達に教える</value>
+        <value xml:lang="nl">Vertel het aan een vriend</value>
         <value xml:lang="pt">Dize-A-Um-Amigo</value>
         <value xml:lang="pt-BR">Indique a um Amigo</value>
         <value xml:lang="ro">Transmite la un Prirten</value>
@@ -2590,6 +2666,7 @@
         <value xml:lang="fr">Devise utilisée</value>
         <value xml:lang="it">Udm Valuta</value>
         <value xml:lang="ja">通貨単位</value>
+        <value xml:lang="nl">UoM valuta</value>
         <value xml:lang="pt">Moeda UomId</value>
         <value xml:lang="ro">Udm Valuta</value>
         <value xml:lang="ru">Код валюты</value>
@@ -2605,6 +2682,7 @@
         <value xml:lang="fr">Prix public</value>
         <value xml:lang="it">Prezzo di listino</value>
         <value xml:lang="ja">定価</value>
+        <value xml:lang="nl">Lijstprijs</value>
         <value xml:lang="pt">Lista de Preços</value>
         <value xml:lang="pt-BR">Preço de tabela</value>
         <value xml:lang="ro">Pret de Lista</value>
@@ -2667,6 +2745,7 @@
         <value xml:lang="fr">Article</value>
         <value xml:lang="it">Prodotto</value>
         <value xml:lang="ja">製品</value>
+        <value xml:lang="nl">Product</value>
         <value xml:lang="pt">Produto</value>
         <value xml:lang="ro">Produs</value>
         <value xml:lang="ru">Продукт</value>
@@ -2682,6 +2761,7 @@
         <value xml:lang="fr">Catégorie d'articles</value>
         <value xml:lang="it">Categoria prodotto</value>
         <value xml:lang="ja">製品カテゴリ</value>
+        <value xml:lang="nl">Productcategorie</value>
         <value xml:lang="pt">Categoria de Produto</value>
         <value xml:lang="pt-BR">Categoria de Produtos</value>
         <value xml:lang="ro">Categoria Produs</value>
@@ -2698,6 +2778,7 @@
         <value xml:lang="fr">Catalogue d'articles</value>
         <value xml:lang="it">Catalogo prodotto</value>
         <value xml:lang="ja">製品カタログ</value>
+        <value xml:lang="nl">Productcatalogus</value>
         <value xml:lang="pt">Catálogo de Produtos</value>
         <value xml:lang="ro">Catalog Produs</value>
         <value xml:lang="ru">Продуктовый каталог</value>
@@ -2729,6 +2810,7 @@
         <value xml:lang="fr">Quantité</value>
         <value xml:lang="it">Quantità</value>
         <value xml:lang="ja">数量</value>
+        <value xml:lang="nl">Hoeveelheid</value>
         <value xml:lang="pt">Quantidade</value>
         <value xml:lang="ro">Cantitate</value>
         <value xml:lang="ru">Количество</value>
@@ -2773,6 +2855,7 @@
         <value xml:lang="fr">Besoin créé quand la quantité disponible (ATP) atteint le stock minimum fixé</value>
         <value xml:lang="it">Fabbisogno per un'ordine quando ATP raggiunge la giacenza minima per il prodotto-stabilimento</value>
         <value xml:lang="ja">製品在庫(納期)が下限到達の場合注文要求</value>
+        <value xml:lang="nl">Requirement voor order, als AtP min. hoeveelheid van product-faciliteit nadert</value>
         <value xml:lang="pt-BR">Requisição para pedido quando o estoque alcançar o mínimo de produtos por instalação</value>
         <value xml:lang="ru">Требование для заказа когда ATP достиг минимального запаса для продукта-устройства</value>
         <value xml:lang="vi">Yêu cầu cho đơn hàng khi ATP đạt số lượng kho tối thiểu cho Product-Facility</value>
@@ -2786,6 +2869,7 @@
         <value xml:lang="fr">Automatique pour chaque ordre de Vente</value>
         <value xml:lang="it">Automatico per ogni ordine di vendita</value>
         <value xml:lang="ja">すべての販売注文に対して自動処理</value>
+        <value xml:lang="nl">Autom. voor iedere verkooporder</value>
         <value xml:lang="pt">Automático Para Cada Encomenda</value>
         <value xml:lang="pt-BR">Automático para todo pedido de vendas</value>
         <value xml:lang="ro">Automatic Pentru Orice Comanda de Vanzare</value>
@@ -2801,6 +2885,7 @@
         <value xml:lang="fr">Expédition par un tiers seulement</value>
         <value xml:lang="it">Solo spedizione conto terzi</value>
         <value xml:lang="ja">直送のみ</value>
+        <value xml:lang="nl">Alleen drop ship</value>
         <value xml:lang="pt-BR">Apenas Drop-Ship</value>
         <value xml:lang="ru">Прямые поставки только</value>
         <value xml:lang="vi">Chỉ Drop-ship</value>
@@ -2813,6 +2898,7 @@
         <value xml:lang="fr">Expédition par un tiers automatique sur faible quantité</value>
         <value xml:lang="it">Spedizione conto terzi automatica sulla bassa quantità</value>
         <value xml:lang="ja">少数時自動直送</value>
+        <value xml:lang="nl">Auto drop ship bij lage hoeveelheid</value>
         <value xml:lang="pt-BR">Drop-ship automático para pequenas quantidades</value>
         <value xml:lang="ru">Автоматическая поставка на маленькое количество</value>
         <value xml:lang="vi">Tự động Drop-ship tại số lượng ít</value>
@@ -2826,6 +2912,7 @@
         <value xml:lang="fr">Aucun besoin créé</value>
         <value xml:lang="it">Nessun fabbisogno creato</value>
         <value xml:lang="ja">要求なし</value>
+        <value xml:lang="nl">Reguirement - geen aangemaakt</value>
         <value xml:lang="pt">Nenhuma Requisição Criada</value>
         <value xml:lang="pt-BR">Nenhuma requisito Criado</value>
         <value xml:lang="ro">Nessun Necesar Creat</value>
@@ -2842,6 +2929,7 @@
         <value xml:lang="fr">Quand la quantité existante (QOH) atteint le stock minimum fixé</value>
         <value xml:lang="it">Quando la QOH raggiunge la giacenza minima per il prodotto-stabilimento</value>
         <value xml:lang="ja">手持在庫が下限到達の場合</value>
+        <value xml:lang="nl">Wanneer QoH de min. hoeveelheid van product-magazijn nadert</value>
         <value xml:lang="pt">Quando QOH (quantidade em espera) Atinge o Stock Mínimo para Produto-Armazém</value>
         <value xml:lang="pt-BR">Quando a quantidade em estoque (QOH) atingir mínimo de produtos por instalação</value>
         <value xml:lang="ro">Cand cantitatea QOH Ajunge la Stocul Minim pe Produs-Compartiment</value>
@@ -2858,6 +2946,7 @@
         <value xml:lang="fr">Quand la quantité disponible (ATP) atteint le stock minimum fixé</value>
         <value xml:lang="it">Quando la ATP raggiunge la giacenza minima per il prodotto-stabilimento</value>
         <value xml:lang="ja">製品在庫(納期)が下限到達の場合</value>
+        <value xml:lang="nl">Wanneer AtP de min. hoeveelheid van product-magazijn nadert</value>
         <value xml:lang="pt">Quando ATP Atinge o Stock Mínimo para Produto-Armazém</value>
         <value xml:lang="pt-BR">Quando o ATP atingir mínimo de produtos por instalação</value>
         <value xml:lang="ro">Cand ATP Ajunge Stocul Minim pe Produs-Compartiment</value>
@@ -2874,6 +2963,7 @@
         <value xml:lang="fr">Expédition gratuite</value>
         <value xml:lang="it">Spedizione gratuita</value>
         <value xml:lang="ja">配送料無料</value>
+        <value xml:lang="nl">Gratis levering</value>
         <value xml:lang="pt">Envio Grátis</value>
         <value xml:lang="pt-BR">Frete Grátis</value>
         <value xml:lang="ro">Expediere Gratuita</value>
@@ -2890,6 +2980,7 @@
         <value xml:lang="fr">Cadeau lors d'un achat</value>
         <value xml:lang="it">Omaggio con acquisto</value>
         <value xml:lang="ja">購入時プレゼント</value>
+        <value xml:lang="nl">Cadeau bij aankoop</value>
         <value xml:lang="pt">Oferta com Compra</value>
         <value xml:lang="pt-BR">Presente para compras</value>
         <value xml:lang="ro">Omagiu la Cumparare</value>
@@ -2922,6 +3013,7 @@
         <value xml:lang="fr">Pourcentage de remise de la commande</value>
         <value xml:lang="it">Percentuale sconto ordine</value>
         <value xml:lang="ja">注文の%割引</value>
+        <value xml:lang="nl">Order - procentuele korting</value>
         <value xml:lang="pt">Desconto de Percentagem em Encomenda</value>
         <value xml:lang="pt-BR">Porcentagem de desconto por pedido</value>
         <value xml:lang="ro">Procent Reducere Comanda</value>
@@ -2986,6 +3078,7 @@
         <value xml:lang="fr">Un article au prix [spécial promo]</value>
         <value xml:lang="it">Prodotto per promozione speciale prezzo</value>
         <value xml:lang="ja">製品を[特別プロモーション]価格で</value>
+        <value xml:lang="nl">Product tegen [speciale promo]-prijs</value>
         <value xml:lang="pt">Produto para [Promo Especial] Preço</value>
         <value xml:lang="pt-BR">Produto por Preço [Promoção especial]</value>
         <value xml:lang="ro">Produs pentru [Promovare Speciala] Pret</value>
@@ -3002,6 +3095,7 @@
         <value xml:lang="fr">Ordre imposé (aucun saut, par organisation)</value>
         <value xml:lang="it">Sequenza forzata (nessuna pausa, per organizzazione)</value>
         <value xml:lang="ja">拡張連番(欠番なし、組織単位)</value>
+        <value xml:lang="nl">Oplopende nummering</value>
         <value xml:lang="pt">Sequência Forçada (sem intervalos, por organização)</value>
         <value xml:lang="pt-BR">Seqüência forçada(sem intervalos por organização)</value>
         <value xml:lang="ro">Secventa Fortata (nici-o pauza, pentru organizare)</value>
@@ -3034,6 +3128,7 @@
         <value xml:lang="fr">Canal de courrier lent</value>
         <value xml:lang="it">Canale snail email</value>
         <value xml:lang="ja">郵便チャネル</value>
+        <value xml:lang="nl">Verkoopkanaal - brief/post</value>
         <value xml:lang="pt">Snail Mail Channel</value>
         <value xml:lang="pt-BR">Canal de correio tradicional</value>
         <value xml:lang="ro">Canal Snail Mail</value>
@@ -3049,6 +3144,7 @@
         <value xml:lang="fr">Niveau Bronze</value>
         <value xml:lang="it">Sottoscrizione bronzo</value>
         <value xml:lang="ja">ブロンズ付与</value>
+        <value xml:lang="nl">Abonnement - brons</value>
         <value xml:lang="pt-BR">Assinatura Bronze</value>
         <value xml:lang="ru">Бронзовая подписка</value>
         <value xml:lang="th">บรอนซ์</value>
@@ -3062,6 +3158,7 @@
         <value xml:lang="fr">Niveau or</value>
         <value xml:lang="it">Sottoscrizione oro</value>
         <value xml:lang="ja">ゴールド付与</value>
+        <value xml:lang="nl">Abonnement - goud</value>
         <value xml:lang="pt-BR">Assinatura ouro</value>
         <value xml:lang="ru">Золотая подписка</value>
         <value xml:lang="th">ทอง</value>
@@ -3075,6 +3172,7 @@
         <value xml:lang="fr">Niveau argent</value>
         <value xml:lang="it">Sottoscrizione argento</value>
         <value xml:lang="ja">シルバー付与</value>
+        <value xml:lang="nl">Abonnement - zilver</value>
         <value xml:lang="pt-BR">Assinatura Prata</value>
         <value xml:lang="ru">Серебряная подписка</value>
         <value xml:lang="th">เงิน</value>
@@ -3118,6 +3216,7 @@
         <value xml:lang="fr">Canal de vente : inconnu</value>
         <value xml:lang="it">Canale sconosciuto</value>
         <value xml:lang="ja">未知のチャネル</value>
+        <value xml:lang="nl">Verkoopkanaal - onbekend</value>
         <value xml:lang="pt">Unknown Channel</value>
         <value xml:lang="pt-BR">Canal Desconhecido</value>
         <value xml:lang="ro">Canal Necunoscut</value>
@@ -3133,6 +3232,7 @@
         <value xml:lang="fr">Mode automatique</value>
         <value xml:lang="it">Automatico</value>
         <value xml:lang="ja">自動</value>
+        <value xml:lang="nl">Automatisch</value>
         <value xml:lang="pt-BR">Automático</value>
         <value xml:lang="ru">Автоматически</value>
         <value xml:lang="th">อัตโนมัติ</value>
@@ -3146,7 +3246,7 @@
         <value xml:lang="fr">Mode manuel</value>
         <value xml:lang="it">Manuale</value>
         <value xml:lang="ja">手動</value>
-        <value xml:lang="pt-BR">Modo Manual</value>
+        <value xml:lang="nl">Handmatig</value>
         <value xml:lang="ru">Вручную</value>
         <value xml:lang="th">คู่มือ</value>
         <value xml:lang="vi">Tự làm</value>
@@ -3159,6 +3259,7 @@
         <value xml:lang="fr">Implémentation de boucle</value>
         <value xml:lang="it">Loop</value>
         <value xml:lang="ja">繰り返し</value>
+        <value xml:lang="nl">Loop</value>
         <value xml:lang="pt-BR">Implmentação de laço</value>
         <value xml:lang="ru">Петля</value>
         <value xml:lang="th">WAT_LOOP</value>
@@ -3172,6 +3273,7 @@
         <value xml:lang="fr">Pas d'implémentation</value>
         <value xml:lang="it">Nessuno</value>
         <value xml:lang="ja">なし</value>
+        <value xml:lang="nl">Nummer</value>
         <value xml:lang="pt-BR">Nenhum</value>
         <value xml:lang="ru">Никто</value>
         <value xml:lang="th">WAT_NO</value>
@@ -3185,6 +3287,7 @@
         <value xml:lang="fr">Route</value>
         <value xml:lang="it">Percorso</value>
         <value xml:lang="ja">経路</value>
+        <value xml:lang="nl">Route</value>
         <value xml:lang="pt-BR">Rota</value>
         <value xml:lang="ru">Дистанционно</value>
         <value xml:lang="th">Route</value>
@@ -3198,6 +3301,7 @@
         <value xml:lang="fr">Implémentation de flux secondaire</value>
         <value xml:lang="it">Flusso secondario</value>
         <value xml:lang="ja">サブフロー</value>
+        <value xml:lang="nl">Sub flow</value>
         <value xml:lang="pt-BR">Subfluxo</value>
         <value xml:lang="ru">Подпоток</value>
         <value xml:lang="th">WAT_SUBFLOW</value>
@@ -3237,6 +3341,7 @@
         <value xml:lang="fr">Booléen - type simple</value>
         <value xml:lang="it">Booleano</value>
         <value xml:lang="ja">真偽型</value>
+        <value xml:lang="nl">Boolean</value>
         <value xml:lang="pt-BR">Booleano</value>
         <value xml:lang="ru">Логический</value>
         <value xml:lang="th">บูลีน</value>
@@ -3250,6 +3355,7 @@
         <value xml:lang="fr">Date-Heure - type de base</value>
         <value xml:lang="it">Data ora</value>
         <value xml:lang="ja">日付時間型</value>
+        <value xml:lang="nl">Datum-tijd</value>
         <value xml:lang="pt-BR">Data/horário</value>
         <value xml:lang="ru">Дата/Время</value>
         <value xml:lang="th">วันเวลา</value>
@@ -3263,6 +3369,7 @@
         <value xml:lang="fr">Déclaré</value>
         <value xml:lang="it">Dichiarato</value>
         <value xml:lang="ja">定義型</value>
+        <value xml:lang="nl">Declaratie</value>
         <value xml:lang="pt-BR">Declarado</value>
         <value xml:lang="ru">Объявленный</value>
         <value xml:lang="th">DECLARED</value>
@@ -3276,6 +3383,7 @@
         <value xml:lang="fr">Enumération - type complexe</value>
         <value xml:lang="it">Enumerazione</value>
         <value xml:lang="ja">列挙型</value>
+        <value xml:lang="nl">Opsomming</value>
         <value xml:lang="pt-BR">Enumeração</value>
         <value xml:lang="ru">Перечисление</value>
         <value xml:lang="th">ENUMERATION</value>
@@ -3407,6 +3515,7 @@
         <value xml:lang="fr">Canal de vente : internet</value>
         <value xml:lang="it">Canale web</value>
         <value xml:lang="ja">Webチャネル</value>
+        <value xml:lang="nl">Verkoopkanaal - web/ecommerce</value>
         <value xml:lang="pt">Canal Web</value>
         <value xml:lang="ro">Canal Web</value>
         <value xml:lang="ru">Web сайт</value>
@@ -3526,6 +3635,14 @@
         <value xml:lang="zh">通用,公共访问</value>
         <value xml:lang="zh-TW">通用,公共訪問</value>
     </property>
+    <property key="Enumeration.description.WF_PREDECESSOR">
+        <value xml:lang="en">Preceding</value>
+        <value xml:lang="nl">Voorafgaand</value>
+    </property>
+    <property key="Enumeration.description.WF_SUCCESSOR">
+        <value xml:lang="en">Succeeding</value>
+        <value xml:lang="nl">Opvolgend</value>
+    </property>
     <property key="Enumeration.description.WFI_MULTIPLE">
         <value xml:lang="en">WFI_MULTIPLE</value>
         <value xml:lang="es">Múltiples</value>
@@ -3805,6 +3922,7 @@
         <value xml:lang="fr">Application</value>
         <value xml:lang="it">Applicazione</value>
         <value xml:lang="ja">業務</value>
+        <value xml:lang="nl">Applicatie/toepassing</value>
         <value xml:lang="pt-BR">Aplicativo</value>
         <value xml:lang="ru">Приложение</value>
         <value xml:lang="th">โปรแกรมประยุกต์ใช้</value>
@@ -3818,6 +3936,7 @@
         <value xml:lang="fr">Procédure</value>
         <value xml:lang="it">Procedura</value>
         <value xml:lang="ja">処理</value>
+        <value xml:lang="nl">Prodedure</value>
         <value xml:lang="pt-BR">Procedimento</value>
         <value xml:lang="ru">Процедура</value>
         <value xml:lang="th">ขั้นตอน</value>
@@ -3864,6 +3983,7 @@
         <value xml:lang="fr">Méthodes COGS (coût des biens vendus)</value>
         <value xml:lang="it">Metodi COGS</value>
         <value xml:lang="ja">売上原価算出方法</value>
+        <value xml:lang="nl">Methode kostprijs verkopen (COGS)</value>
         <value xml:lang="pt">Métodos de Custo das Matérias-Primas</value>
         <value xml:lang="pt-BR">Métodos de custo de matéria-prima</value>
         <value xml:lang="ro">Metode COGS</value>
@@ -3880,6 +4000,7 @@
         <value xml:lang="fr">Type d'emplacement de stockage</value>
         <value xml:lang="it">Tipo posizione stabilimento</value>
         <value xml:lang="ja">拠点位置種類</value>
+        <value xml:lang="nl">Soort locatie (faciliteit)</value>
         <value xml:lang="pt">Tpo de Localização de Instalação</value>
         <value xml:lang="pt-BR">Tipo de localização da Instalação</value>
         <value xml:lang="ro">Tip Pozitie Compartiment</value>
@@ -3896,6 +4017,7 @@
         <value xml:lang="fr">Classe d'immobilisation</value>
         <value xml:lang="it">Classe cespite</value>
         <value xml:lang="ja">固定資産分類</value>
+        <value xml:lang="nl">Klasse vaste activa</value>
         <value xml:lang="pt">Fixed Asset Class</value>
         <value xml:lang="pt-BR">Classe de Ativo Fixo</value>
         <value xml:lang="ro">Clasa Mijloace Fixe</value>
@@ -3912,6 +4034,7 @@
         <value xml:lang="fr">Mode de numérotation des factures</value>
         <value xml:lang="it">Modo sequenza fattura</value>
         <value xml:lang="ja">請求書番号採番方法</value>
+        <value xml:lang="nl">Methode volgnummers facturen</value>
         <value xml:lang="pt">Modo de Sequência de Facturação</value>
         <value xml:lang="pt-BR">Modo sequencial da Fatura</value>
         <value xml:lang="ro">Mod Seqventa Factura</value>
@@ -3928,6 +4051,7 @@
         <value xml:lang="fr">Inventaire des ordres de réservation</value>
         <value xml:lang="it">Inventario ordini riservati</value>
         <value xml:lang="ja">在庫予約注文</value>
+        <value xml:lang="nl">Volgorde voorraadreservering</value>
         <value xml:lang="pt">Encomenda Reserva de Inventário</value>
         <value xml:lang="pt-BR">Pedido de reserva no inventário</value>
         <value xml:lang="ro">Inventar Comenzi Rezervate</value>
@@ -3977,6 +4101,7 @@
         <value xml:lang="fr">Canal de commande de vente</value>
         <value xml:lang="it">Canale di vendita</value>
         <value xml:lang="ja">注文販売チャネル</value>
+        <value xml:lang="nl">Order verkoopkanaal</value>
         <value xml:lang="pt">Canal de Encomendas (Vendas)</value>
         <value xml:lang="pt-BR">Canal de Pedidos de Vendas</value>
         <value xml:lang="ro">Canal de Vanzare</value>
@@ -3993,6 +4118,7 @@
         <value xml:lang="fr">Mode de numérotation des commandes</value>
         <value xml:lang="it">Modo sequenza ordini</value>
         <value xml:lang="ja">注文番号採番方法</value>
+        <value xml:lang="nl">Methode volgnummers orders</value>
         <value xml:lang="pt">Modo de Sequência de Encomenda</value>
         <value xml:lang="pt-BR">Modo sequencial de Pedidos</value>
         <value xml:lang="ro">Mod Secventa Ordine</value>
@@ -4025,6 +4151,7 @@
         <value xml:lang="fr">Email des magasins</value>
         <value xml:lang="it">Notifica email negozio</value>
         <value xml:lang="ja">製品店舗Eメール通知</value>
+        <value xml:lang="nl">Email notifictie productwinkel</value>
         <value xml:lang="pt">Notificação por Email de Produto de Loja</value>
         <value xml:lang="pt-BR">E-mail de Notificação da loja</value>
         <value xml:lang="ro">Notifica Email Magazin</value>
@@ -4070,6 +4197,7 @@
         <value xml:lang="fr">Condition de prix</value>
         <value xml:lang="it">Condizioni promozioni prodotto</value>
         <value xml:lang="ja">製品プロモーション条件</value>
+        <value xml:lang="nl">Conditie product-promo</value>
         <value xml:lang="pt">Condição de Promoção de Produto</value>
         <value xml:lang="pt-BR">Condição para a Promoção de Produtos</value>
         <value xml:lang="ro">Conditii Promovari Produse</value>
@@ -4102,6 +4230,7 @@
         <value xml:lang="fr">Action de promotion</value>
         <value xml:lang="it">Azione promozione prodotto</value>
         <value xml:lang="ja">製品プロモーション活動</value>
+        <value xml:lang="nl">Actie product-promo</value>
         <value xml:lang="pt">Acção de Promoção de Produto</value>
         <value xml:lang="pt-BR">Ação de promoção do produto</value>
         <value xml:lang="ro">Actiune Promovare Produs</value>
@@ -4118,6 +4247,7 @@
         <value xml:lang="fr">Condition de promotion</value>
         <value xml:lang="it">Condizione promozione prodotto</value>
         <value xml:lang="ja">製品プロモーション条件</value>
+        <value xml:lang="nl">Conditie product-promo</value>
         <value xml:lang="pt">Condição de Promoção de Produto</value>
         <value xml:lang="pt-BR">Condição para a Promoção de Produtos</value>
         <value xml:lang="ro">Conditie Promovare Produs</value>
@@ -4182,6 +4312,7 @@
         <value xml:lang="fr">Méthode de besoin d'article</value>
         <value xml:lang="it">Tipo metodo fabbisogno prodotto</value>
         <value xml:lang="ja">製品要求方法</value>
+        <value xml:lang="nl">Methode product-requirement</value>
         <value xml:lang="pt">Método de Requisição de Produto</value>
         <value xml:lang="pt-BR">Método de requisitos do produto</value>
         <value xml:lang="ro">Tip Necesar Produs</value>
@@ -4214,6 +4345,7 @@
         <value xml:lang="fr">Mode de numérotation des devis</value>
         <value xml:lang="it">Modo sequenza preventivo</value>
         <value xml:lang="ja">見積番号採番方法</value>
+        <value xml:lang="nl">Methode nummering - quote</value>
         <value xml:lang="pt">Modo de Sequência de Quotação</value>
         <value xml:lang="pt-BR">Modo sequencial para cotações</value>
         <value xml:lang="ro">Mod Secventa Oferta</value>
@@ -4245,6 +4377,7 @@
         <value xml:lang="fr">Attentes de tâches</value>
         <value xml:lang="it">Aspettative impegni di lavoro</value>
         <value xml:lang="ja">作業成果要望</value>
+        <value xml:lang="nl">Work Effort - verwachtingen</value>
         <value xml:lang="pt">Estimativas de Esforço de Trabalho</value>
         <value xml:lang="pt-BR">Estimativas para o esforço de trabalho</value>
         <value xml:lang="ro">Aspectative Sarcini de Lucru</value>
@@ -4261,6 +4394,7 @@
         <value xml:lang="fr">Classification de portée de tâche</value>
         <value xml:lang="it">Capacità classificazioni impegno di lavoro</value>
         <value xml:lang="ja">作業成果範囲分類</value>
+        <value xml:lang="nl">Work Effort - scope</value>
         <value xml:lang="pt">Classificações de Nível de Esforço de Trabalho</value>
         <value xml:lang="pt-BR">Classificações do Escopo do Esforço Trabalho</value>
         <value xml:lang="ro">Capacitate Clasificare Sarcini de Lucru</value>
@@ -4367,6 +4501,7 @@
         <value xml:lang="fr">Albanie</value>
         <value xml:lang="it">Albania</value>
         <value xml:lang="ja">アルバニア</value>
+        <value xml:lang="nl">Albanië</value>
         <value xml:lang="pt">Albania</value>
         <value xml:lang="pt-BR">Albânia</value>
         <value xml:lang="ro">Albania</value>
@@ -4398,6 +4533,7 @@
         <value xml:lang="fr">Antilles néerlandaises</value>
         <value xml:lang="it">Antille Paesi Bassi</value>
         <value xml:lang="ja">オランダ領アンティル</value>
+        <value xml:lang="nl">Nederlandse Antillen</value>
         <value xml:lang="pt">Netherlands Antilles</value>
         <value xml:lang="pt-BR">Antilhas Holandesas</value>
         <value xml:lang="ro">Antille Paesi Bassi</value>
@@ -4430,6 +4566,7 @@
         <value xml:lang="fr">Argentine</value>
         <value xml:lang="it">Argentina</value>
         <value xml:lang="ja">アルゼンチン</value>
+        <value xml:lang="nl">Argentinië</value>
         <value xml:lang="pt">Argentina</value>
         <value xml:lang="ro">Argentina</value>
         <value xml:lang="ru">Аргентина</value>
@@ -4445,6 +4582,7 @@
         <value xml:lang="fr">Arménie</value>
         <value xml:lang="it">Armenia</value>
         <value xml:lang="ja">アルメニア</value>
+        <value xml:lang="nl">Armenië</value>
         <value xml:lang="pt">Armenia</value>
         <value xml:lang="pt-BR">Armênia</value>
         <value xml:lang="ru">Армения</value>
@@ -4524,6 +4662,7 @@
         <value xml:lang="fr">Australie</value>
         <value xml:lang="it">Australia</value>
         <value xml:lang="ja">オーストラリア</value>
+        <value xml:lang="nl">Australië</value>
         <value xml:lang="pt">Australia</value>
         <value xml:lang="pt-BR">Austrália</value>
         <value xml:lang="ro">Australia</value>
@@ -4540,6 +4679,7 @@
         <value xml:lang="fr">Autriche</value>
         <value xml:lang="it">Austria</value>
         <value xml:lang="ja">オーストリア</value>
+        <value xml:lang="nl">Oostenrijk</value>
         <value xml:lang="pt">Austria</value>
         <value xml:lang="pt-BR">Áustria</value>
         <value xml:lang="ro">Austria</value>
@@ -4571,6 +4711,7 @@
         <value xml:lang="fr">Colombie-Britannique</value>
         <value xml:lang="it">BC</value>
         <value xml:lang="ja">ブリティッシュ・コロンビア</value>
+        <value xml:lang="nl">Brits Columbia</value>
         <value xml:lang="pt-BR">Colúmbia Britânica</value>
         <value xml:lang="ru">Британский-Колумбийский</value>
         <value xml:lang="th">BC</value>
@@ -4600,6 +4741,7 @@
         <value xml:lang="fr">Belgique</value>
         <value xml:lang="it">Belgio</value>
         <value xml:lang="ja">ベルギー</value>
+        <value xml:lang="nl">België</value>
         <value xml:lang="pt">Belgium</value>
         <value xml:lang="pt-BR">Bélgica</value>
         <value xml:lang="ro">Belgio</value>
@@ -4787,6 +4929,7 @@
         <value xml:lang="fr">Brésil</value>
         <value xml:lang="it">Brasile</value>
         <value xml:lang="ja">ブラジル</value>
+        <value xml:lang="nl">Brazilië</value>
         <value xml:lang="pt">Brazil</value>
         <value xml:lang="pt-BR">Brasil</value>
         <value xml:lang="ro">Brazilia</value>
@@ -4927,6 +5070,7 @@
         <value xml:lang="fr">Suisse</value>
         <value xml:lang="it">Svizzera</value>
         <value xml:lang="ja">スイス</value>
+        <value xml:lang="nl">Zwitserland</value>
         <value xml:lang="pt">Switzerland</value>
         <value xml:lang="pt-BR">Suíça</value>
         <value xml:lang="ro">Elvezia</value>
@@ -5194,6 +5338,7 @@
         <value xml:lang="fr">Allemagne</value>
         <value xml:lang="it">Germania</value>
         <value xml:lang="ja">ドイツ</value>
+        <value xml:lang="nl">Duitsland</value>
         <value xml:lang="pt">Germany</value>
         <value xml:lang="pt-BR">Alemanha</value>
         <value xml:lang="ro">Germania</value>
@@ -5320,6 +5465,7 @@
         <value xml:lang="fr">Angleterre</value>
         <value xml:lang="it">Inghilterra</value>
         <value xml:lang="ja">イングランド</value>
+        <value xml:lang="nl">Engeland</value>
         <value xml:lang="pt">England</value>
         <value xml:lang="pt-BR">Inglaterra</value>
         <value xml:lang="ro">Anglia</value>
@@ -5367,6 +5513,7 @@
         <value xml:lang="fr">Espagne</value>
         <value xml:lang="it">Spagna</value>
         <value xml:lang="ja">スペイン</value>
+        <value xml:lang="nl">Spanje</value>
         <value xml:lang="pt">Spain</value>
         <value xml:lang="pt-BR">Espanha</value>
         <value xml:lang="ro">Spagna</value>
@@ -5383,6 +5530,7 @@
         <value xml:lang="fr">Estonie</value>
         <value xml:lang="it">Estonia</value>
         <value xml:lang="ja">エストニア</value>
+        <value xml:lang="nl">Estland</value>
         <value xml:lang="pt">Estonia</value>
         <value xml:lang="pt-BR">Estônia</value>
         <value xml:lang="ro">Estonia</value>
@@ -5415,6 +5563,7 @@
         <value xml:lang="fr">Finlande</value>
         <value xml:lang="it">Finlandia</value>
         <value xml:lang="ja">フィンランド</value>
+        <value xml:lang="nl">Finland</value>
         <value xml:lang="pt">Finland</value>
         <value xml:lang="pt-BR">Finlândia</value>
         <value xml:lang="ro">Finlandia</value>
@@ -5462,6 +5611,7 @@
         <value xml:lang="fr">France</value>
         <value xml:lang="it">Francia</value>
         <value xml:lang="ja">フランス</value>
+        <value xml:lang="nl">Frankrijk</value>
         <value xml:lang="pt">France</value>
         <value xml:lang="pt-BR">França</value>
         <value xml:lang="ro">Francia</value>
@@ -5541,6 +5691,7 @@
         <value xml:lang="fr">Royaume-Uni</value>
         <value xml:lang="it">Regno Unito</value>
         <value xml:lang="ja">イギリス</value>
+        <value xml:lang="nl">Verenigd Koninkrijk</value>
         <value xml:lang="pt">United Kingdom</value>
         <value xml:lang="pt-BR">Reino Unido</value>
         <value xml:lang="ro">Regniul Unit</value>
@@ -5681,6 +5832,7 @@
         <value xml:lang="fr">Grèce</value>
         <value xml:lang="it">Grecia</value>
         <value xml:lang="ja">ギリシャ</value>
+        <value xml:lang="nl">Griekenland</value>
         <value xml:lang="pt">Greece</value>
         <value xml:lang="pt-BR">Grécia</value>
         <value xml:lang="ro">Grecia</value>
@@ -5710,6 +5862,7 @@
         <value xml:lang="fr">Groënland</value>
         <value xml:lang="it">Groenlandia</value>
         <value xml:lang="ja">グリーンランド</value>
+        <value xml:lang="nl">Groenland</value>
         <value xml:lang="pt">Greenland</value>
         <value xml:lang="pt-BR">Groenlândia</value>
         <value xml:lang="ro">Groenlandia</value>
@@ -5827,6 +5980,7 @@
         <value xml:lang="fr">Croatie</value>
         <value xml:lang="it">Croazia</value>
         <value xml:lang="ja">クロアチア(現地名:フルヴァツカ)</value>
+        <value xml:lang="nl">Kroatië</value>
         <value xml:lang="pt">Croatia (local Name: Hrvatska)</value>
         <value xml:lang="pt-BR">Croácia (nome local: Hrvatska)</value>
         <value xml:lang="ro">Croazia</value>
@@ -5856,6 +6010,7 @@
         <value xml:lang="fr">Hongrie</value>
         <value xml:lang="it">Ungheria</value>
         <value xml:lang="ja">ハンガリー</value>
+        <value xml:lang="nl">Hongarije</value>
         <value xml:lang="pt">Hungary</value>
         <value xml:lang="pt-BR">Hungria</value>
         <value xml:lang="ro">Ungaria</value>
@@ -5871,6 +6026,7 @@
         <value xml:lang="fr">Indonésie</value>
         <value xml:lang="it">Indonesia</value>
         <value xml:lang="ja">インドネシア</value>
+        <value xml:lang="nl">Indonesië</value>
         <value xml:lang="pt">Indonesia</value>
         <value xml:lang="pt-BR">Indonésia</value>
         <value xml:lang="ro">Indonesia</value>
@@ -5917,6 +6073,7 @@
         <value xml:lang="fr">Irlande</value>
         <value xml:lang="it">Irlanda</value>
         <value xml:lang="ja">アイルランド</value>
+        <value xml:lang="nl">Ierland</value>
         <value xml:lang="pt">Ireland</value>
         <value xml:lang="pt-BR">Irlanda</value>
         <value xml:lang="ro">Irlanda</value>
@@ -5962,6 +6119,7 @@
         <value xml:lang="fr">Islande</value>
         <value xml:lang="it">Islanda</value>
         <value xml:lang="ja">アイスランド</value>
+        <value xml:lang="nl">Ijsland</value>
         <value xml:lang="pt">Iceland</value>
         <value xml:lang="pt-BR">Islândia</value>
         <value xml:lang="ro">Islanda</value>
@@ -5991,6 +6149,7 @@
         <value xml:lang="fr">Italie</value>
         <value xml:lang="it">Italia</value>
         <value xml:lang="ja">イタリア</value>
+        <value xml:lang="nl">Italië</value>
         <value xml:lang="pt">Italy</value>
         <value xml:lang="pt-BR">Itália</value>
         <value xml:lang="ro">Italia</value>
@@ -6306,6 +6465,7 @@
         <value xml:lang="fr">Luxembourg</value>
         <value xml:lang="it">Lussemburgo</value>
         <value xml:lang="ja">ルクセンブルク</value>
+        <value xml:lang="nl">Luxemburg</value>
         <value xml:lang="pt">Luxembourg</value>
         <value xml:lang="pt-BR">Luxemburgo</value>
         <value xml:lang="ro">Lussemburg</value>
@@ -6772,6 +6932,7 @@
         <value xml:lang="fr">Irlande du Nord</value>
         <value xml:lang="it">Irlanda del Nord</value>
         <value xml:lang="ja">北アイルランド</value>
+        <value xml:lang="nl">Noord Ierland</value>
         <value xml:lang="pt">N.Ireland</value>
         <value xml:lang="pt-BR">Irlanda do Norte</value>
         <value xml:lang="ro">Irlanda de Nord</value>
@@ -6824,6 +6985,7 @@
         <value xml:lang="fr">Pays-Bas</value>
         <value xml:lang="it">Paesi Bassi</value>
         <value xml:lang="ja">オランダ</value>
+        <value xml:lang="nl">Nederland</value>
         <value xml:lang="pt">Netherlands</value>
         <value xml:lang="pt-BR">Holanda</value>
         <value xml:lang="ro">Paesi Bassi</value>
@@ -6839,6 +7001,7 @@
         <value xml:lang="fr">Norvège</value>
         <value xml:lang="it">Norvegia</value>
         <value xml:lang="ja">ノルウェー</value>
+        <value xml:lang="nl">Noorwegen</value>
         <value xml:lang="pt">Norway</value>
         <value xml:lang="pt-BR">Noruega</value>
         <value xml:lang="ro">Norvegia</value>
@@ -6880,6 +7043,7 @@
         <value xml:lang="fr">Nouvelle-Ecosse</value>
         <value xml:lang="it">NS</value>
         <value xml:lang="ja">ノヴァスコシア</value>
+        <value xml:lang="nl">Nova Scotia</value>
         <value xml:lang="pt-BR">Nova Escócia</value>
         <value xml:lang="ru">НС</value>
         <value xml:lang="th">NS</value>
@@ -6915,6 +7079,7 @@
         <value xml:lang="fr">Nouvelle-Zélande</value>
         <value xml:lang="it">Nuova Zelanda</value>
         <value xml:lang="ja">ニュージーランド</value>
+        <value xml:lang="nl">Nieuw-Zeeland</value>
         <value xml:lang="pt">New Zealand</value>
         <value xml:lang="pt-BR">Nova Zelândia</value>
         <value xml:lang="ro">Nuova Zelanda</value>
@@ -7070,6 +7235,7 @@
         <value xml:lang="fr">Pologne</value>
         <value xml:lang="it">Polonia</value>
         <value xml:lang="ja">ポーランド</value>
+        <value xml:lang="nl">Polen</value>
         <value xml:lang="pt">Poland</value>
         <value xml:lang="pt-BR">Polônia</value>
         <value xml:lang="ro">Polonia</value>
@@ -7276,6 +7442,7 @@
         <value xml:lang="fr">Ecosse</value>
         <value xml:lang="it">Scozia</value>
         <value xml:lang="ja">スコットランド</value>
+        <value xml:lang="nl">Schotland</value>
         <value xml:lang="pt">Scotland</value>
         <value xml:lang="pt-BR">Escócia</value>
         <value xml:lang="ro">Scozia</value>
@@ -7506,6 +7673,7 @@
         <value xml:lang="fr">Surinam</value>
         <value xml:lang="it">Suriname</value>
         <value xml:lang="ja">スリナム</value>
+        <value xml:lang="nl">Suriname</value>
         <value xml:lang="pt">Suriname</value>
         <value xml:lang="ro">Suriname</value>
         <value xml:lang="ru">Суринам</value>
@@ -7550,6 +7718,7 @@
         <value xml:lang="fr">Suède</value>
         <value xml:lang="it">Svezia</value>
         <value xml:lang="ja">スウェーデン</value>
+        <value xml:lang="nl">Zweden</value>
         <value xml:lang="pt">Sweden</value>
         <value xml:lang="pt-BR">Suécia</value>
         <value xml:lang="ro">Suedia</value>
@@ -7889,6 +8058,7 @@
         <value xml:lang="fr">Etats-Unis</value>
         <value xml:lang="it">Stati Uniti d'America</value>
         <value xml:lang="ja">アメリカ</value>
+        <value xml:lang="nl">Verenigde Staten van Amerika</value>
         <value xml:lang="pt">United States</value>
         <value xml:lang="pt-BR">Estados Unidos</value>
         <value xml:lang="ro">USA</value>
@@ -8023,6 +8193,7 @@
         <value xml:lang="fr">Pays de Galles</value>
         <value xml:lang="it">Galles</value>
         <value xml:lang="ja">ウェールズ</value>
+        <value xml:lang="nl">Wales</value>
         <value xml:lang="pt">Wales</value>
         <value xml:lang="pt-BR">País de Gales</value>
         <value xml:lang="ro">Galles</value>
@@ -8165,6 +8336,7 @@
         <value xml:lang="fr">Non applicable</value>
         <value xml:lang="it">Non applicabile</value>
         <value xml:lang="ja">適用外</value>
+        <value xml:lang="nl">Niet beschikbaar/niet van toepassing</value>
         <value xml:lang="pt">Não Aplicável</value>
         <value xml:lang="ro">Ne Aplicabil</value>
         <value xml:lang="ru">Не применимо</value>
@@ -8180,6 +8352,7 @@
         <value xml:lang="fr">Ville</value>
         <value xml:lang="it">Città</value>
         <value xml:lang="ja">市区町村</value>
+        <value xml:lang="nl">Stad</value>
         <value xml:lang="pt">Cidade</value>
         <value xml:lang="ro">Oras</value>
         <value xml:lang="ru">Город</value>
@@ -8195,6 +8368,7 @@
         <value xml:lang="fr">Pays</value>
         <value xml:lang="it">Paese</value>
         <value xml:lang="ja">国</value>
+        <value xml:lang="nl">Land</value>
         <value xml:lang="pt">País</value>
         <value xml:lang="ro">Tara</value>
         <value xml:lang="ru">Страна</value>
@@ -8210,6 +8384,7 @@
         <value xml:lang="fr">Département</value>
         <value xml:lang="it">Contea</value>
         <value xml:lang="ja">郡</value>
+        <value xml:lang="nl">Departement</value>
         <value xml:lang="pt">Condado/Dístrito</value>
         <value xml:lang="pt-BR">Município</value>
         <value xml:lang="ro">Sector</value>
@@ -8226,6 +8401,7 @@
         <value xml:lang="fr">Agglomération</value>
         <value xml:lang="it">Contea-Città</value>
         <value xml:lang="ja">郡-市</value>
+        <value xml:lang="nl">Departement - stad</value>
         <value xml:lang="pt">Condado/Dístrito-Cidade</value>
         <value xml:lang="pt-BR">Comarca-cidade</value>
         <value xml:lang="ro">Sector-Oras</value>
@@ -8242,6 +8418,7 @@
         <value xml:lang="fr">Groupe</value>
         <value xml:lang="it">Gruppo</value>
         <value xml:lang="ja">グループ</value>
+        <value xml:lang="nl">Groep</value>
         <value xml:lang="pt">Grupo</value>
         <value xml:lang="ro">Grup</value>
         <value xml:lang="ru">Группа</value>
@@ -8257,6 +8434,7 @@
         <value xml:lang="fr">Code Postal</value>
         <value xml:lang="it">Codice postale</value>
         <value xml:lang="ja">郵便番号</value>
+        <value xml:lang="nl">Postcode</value>
         <value xml:lang="pt">Código Postal</value>
         <value xml:lang="pt-BR">CEP</value>
         <value xml:lang="ro">C.P.</value>
@@ -8273,6 +8451,7 @@
         <value xml:lang="fr">Province</value>
         <value xml:lang="it">Provincia</value>
         <value xml:lang="ja">都道府県/省/地方</value>
+        <value xml:lang="nl">Provincie</value>
         <value xml:lang="pt">Provincia</value>
         <value xml:lang="pt-BR">Província</value>
         <value xml:lang="ro">Judet</value>
@@ -8289,6 +8468,7 @@
         <value xml:lang="fr">Région</value>
         <value xml:lang="it">Regione</value>
         <value xml:lang="ja">地区</value>
+        <value xml:lang="nl">Regio</value>
         <value xml:lang="pt">Região</value>
         <value xml:lang="ro">Regiune</value>
         <value xml:lang="ru">Область</value>
@@ -8304,6 +8484,7 @@
         <value xml:lang="fr">Territoire de vente</value>
         <value xml:lang="it">Territorio di vendita</value>
         <value xml:lang="ja">営業区域</value>
+        <value xml:lang="nl">Regio - verkoop</value>
         <value xml:lang="pt">Território de Vendas</value>
         <value xml:lang="ro">Teritoriu Vanzari</value>
         <value xml:lang="ru">Территория продаж</value>
@@ -8319,6 +8500,7 @@
         <value xml:lang="fr">Territoire de service</value>
         <value xml:lang="it">Territorio servizio</value>
         <value xml:lang="ja">サービス区域</value>
+        <value xml:lang="nl">Regio - service</value>
         <value xml:lang="pt">Território do Serviço</value>
         <value xml:lang="ro">Teritoriu Serviciu</value>
         <value xml:lang="ru">Сервисная территория</value>
@@ -8334,6 +8516,7 @@
         <value xml:lang="fr">Etat</value>
         <value xml:lang="it">Stato</value>
         <value xml:lang="ja">州</value>
+        <value xml:lang="nl">Staat</value>
         <value xml:lang="pt">Estado</value>
         <value xml:lang="ro">Stat</value>
         <value xml:lang="ru">Штат</value>
@@ -8349,6 +8532,7 @@
         <value xml:lang="fr">Territoire</value>
         <value xml:lang="it">Territorio</value>
         <value xml:lang="ja">区域</value>
+        <value xml:lang="nl">Territorium</value>
         <value xml:lang="pt">Território</value>
         <value xml:lang="ro">Teritoriu</value>
         <value xml:lang="ru">Территория</value>
@@ -8364,6 +8548,7 @@
         <value xml:lang="fr">Non réconcilié</value>
         <value xml:lang="it">Non riconciliato</value>
         <value xml:lang="ja">未消込</value>
+        <value xml:lang="nl">Niet</value>
         <value xml:lang="pt-BR">Não Reconciliados</value>
         <value xml:lang="ru">Не смирились</value>
         <value xml:lang="th">ไม่ยอมรับ</value>
@@ -8378,6 +8563,7 @@
         <value xml:lang="fr">Partiellement réconcilié</value>
         <value xml:lang="it">Parzialmente riconciliato</value>
         <value xml:lang="ja">一部消込</value>
+        <value xml:lang="nl">Gedeeltelijk</value>
         <value xml:lang="pt-BR">Reconciliado parcialmente</value>
         <value xml:lang="ru">Частично примирились</value>
         <value xml:lang="th">การยอมรับบางส่วน</value>
@@ -8392,6 +8578,7 @@
         <value xml:lang="fr">Réconcilié</value>
         <value xml:lang="it">Riconciliato</value>
         <value xml:lang="ja">消込済</value>
+        <value xml:lang="nl">Volledig</value>
         <value xml:lang="pt-BR">Reconciliados</value>
         <value xml:lang="ru">Смирились</value>
         <value xml:lang="th">ทำให้ยอมรับ</value>
@@ -8649,6 +8836,7 @@
         <value xml:lang="fr">En cours d'utilisation</value>
         <value xml:lang="it">In uso</value>
         <value xml:lang="ja">使用中</value>
+        <value xml:lang="nl">In gebruik</value>
         <value xml:lang="pt-BR">Em Uso</value>
         <value xml:lang="ru">В использовании</value>
         <value xml:lang="vi">Đang sử dụng</value>
@@ -8662,6 +8850,7 @@
         <value xml:lang="fr">Acceptation en attente</value>
         <value xml:lang="it">Accettazione sospesa</value>
         <value xml:lang="ja">受付保留</value>
+        <value xml:lang="nl">Wacht op acceptatie</value>
         <value xml:lang="pt">Aceitação Pendente</value>
         <value xml:lang="pt-BR">Pendentes de Aceitação</value>
         <value xml:lang="ro">Aceptare Suspendata</value>
@@ -8678,6 +8867,7 @@
         <value xml:lang="fr">Refusée</value>
         <value xml:lang="it">Rifiutata</value>
         <value xml:lang="ja">否認</value>
+        <value xml:lang="nl">Geweigerd</value>
         <value xml:lang="pt">Rejeitada</value>
         <value xml:lang="pt-BR">Rejeitado</value>
         <value xml:lang="ro">Refuzata</value>
@@ -8693,6 +8883,7 @@
         <value xml:lang="fr">Approuvé</value>
         <value xml:lang="it">Approvato</value>
         <value xml:lang="ja">承認</value>
+        <value xml:lang="nl">Goedgekeurd</value>
         <value xml:lang="pt-BR">Aprovado</value>
         <value xml:lang="ru">Подтвержден</value>
         <value xml:lang="vi">Đã duyệt</value>
@@ -8705,6 +8896,7 @@
         <value xml:lang="fr">Approbation en cours</value>
         <value xml:lang="it">Approvazione in corso</value>
         <value xml:lang="ja">承認処理中</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt-BR">Aprovação em processo</value>
         <value xml:lang="ru">Утверждение в процессе</value>
         <value xml:lang="vi">Đang trong quá trình xét duyệt</value>
@@ -8717,6 +8909,7 @@
         <value xml:lang="fr">Non prêt pour approbation</value>
         <value xml:lang="it">Non pronto per l'approvazione</value>
         <value xml:lang="ja">承認準備未了</value>
+        <value xml:lang="nl">Niet klaar voor fiattering</value>
         <value xml:lang="pt-BR">Não está pronto para aprovação</value>
         <value xml:lang="ru">Не готов для потверждения</value>
         <value xml:lang="vi">Không sẵn sàng cho duyệt</value>
@@ -8729,6 +8922,7 @@
         <value xml:lang="fr">Prêt pour approbation</value>
         <value xml:lang="it">Pronto per l'approvazione</value>
         <value xml:lang="ja">承認準備完了</value>
+        <value xml:lang="nl">Klaar voor fiattering</value>
         <value xml:lang="pt-BR">Pronto para aprovação</value>
         <value xml:lang="ru">Готов для потверждения</value>
         <value xml:lang="vi">Sẵn sàng cho duyệt</value>
@@ -8741,6 +8935,7 @@
         <value xml:lang="fr">Refusé</value>
         <value xml:lang="it">Rifiutato</value>
         <value xml:lang="ja">否認</value>
+        <value xml:lang="nl">Afgekeurd/Geweigerd</value>
         <value xml:lang="pt-BR">Rejeitado</value>
         <value xml:lang="ru">Отклонены</value>
         <value xml:lang="vi">Từ chối</value>
@@ -8766,6 +8961,7 @@
         <value xml:lang="fr">Annulée</value>
         <value xml:lang="it">Cancellato</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt">Cancelado</value>
         <value xml:lang="ro">Sters</value>
         <value xml:lang="ru">Отменено</value>
@@ -8781,6 +8977,7 @@
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond/compleet</value>
         <value xml:lang="pt">Completo</value>
         <value xml:lang="ro">Completat</value>
         <value xml:lang="ru">Завершено</value>
@@ -8796,6 +8993,7 @@
         <value xml:lang="fr">Saisi</value>
         <value xml:lang="it">Inserito</value>
         <value xml:lang="ja">登録</value>
+        <value xml:lang="nl">Opgevoerd</value>
         <value xml:lang="pt">Inserido</value>
         <value xml:lang="pt-BR">Introduzido</value>
         <value xml:lang="ro">Introdus</value>
@@ -8812,6 +9010,7 @@
         <value xml:lang="fr">En cours</value>
         <value xml:lang="it">In esecuzione</value>
         <value xml:lang="ja">処理中</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt">Em Progresso</value>
         <value xml:lang="pt-BR">Em andamento</value>
         <value xml:lang="ro">In-Executie</value>
@@ -8828,6 +9027,7 @@
         <value xml:lang="fr">En attente</value>
         <value xml:lang="it">Sospeso</value>
         <value xml:lang="ja">保留</value>
+        <value xml:lang="nl">Wachtend</value>
         <value xml:lang="pt">Pendente</value>
         <value xml:lang="ro">Suspendat</value>
         <value xml:lang="ru">Ожидающее</value>
@@ -8858,6 +9058,7 @@
         <value xml:lang="fr">Résolu</value>
         <value xml:lang="it">Risolto</value>
         <value xml:lang="ja">解決</value>
+        <value xml:lang="nl">Opgelost</value>
         <value xml:lang="pt">Resolvido</value>
         <value xml:lang="pt-BR">Resolvida</value>
         <value xml:lang="ro">Soluzionat</value>
@@ -8873,6 +9074,7 @@
         <value xml:lang="fr">Fermé</value>
         <value xml:lang="it">Chiuso</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond/compleet</value>
         <value xml:lang="pt-BR">Fechado</value>
         <value xml:lang="ru">Закрыто</value>
         <value xml:lang="vi">Đã đóng</value>
@@ -8929,6 +9131,7 @@
         <value xml:lang="fr">Accepté</value>
         <value xml:lang="it">Accettata</value>
         <value xml:lang="ja">受付</value>
+        <value xml:lang="nl">Geaccepteerd</value>
         <value xml:lang="pt">Aceite</value>
         <value xml:lang="pt-BR">Aceito</value>
         <value xml:lang="ro">Acceptata</value>
@@ -8945,6 +9148,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Cancellata</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt">Cancelado</value>
         <value xml:lang="ro">Stearsa</value>
         <value xml:lang="ru">Отменен</value>
@@ -8960,6 +9164,7 @@
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="it">Completata</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond/compleet</value>
         <value xml:lang="pt">Completo</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ro">Completata</value>
@@ -8974,6 +9179,7 @@
         <value xml:lang="es">Esbozo</value>
         <value xml:lang="fr">Brouillon</value>
         <value xml:lang="ja">原稿</value>
+        <value xml:lang="nl">Concept</value>
         <value xml:lang="pt-BR">Projeto</value>
         <value xml:lang="ru">Проект</value>
         <value xml:lang="vi">Nháp</value>
@@ -8985,6 +9191,7 @@
         <value xml:lang="es">Pendiente</value>
         <value xml:lang="fr">En attente</value>
         <value xml:lang="ja">保留顧客</value>
+        <value xml:lang="nl">Wachtend</value>
         <value xml:lang="pt-BR">Pendente</value>
         <value xml:lang="ru">Ожидание</value>
         <value xml:lang="vi">Yêu cầu từ khách hàng đang đợi xử lý</value>
@@ -8998,6 +9205,7 @@
         <value xml:lang="fr">Rejeté</value>
         <value xml:lang="it">Rifiutato</value>
         <value xml:lang="ja">否認</value>
+        <value xml:lang="nl">Afgewezen/geweigerd</value>
         <value xml:lang="pt">Rejeitado</value>
         <value xml:lang="ro">Refuzata</value>
         <value xml:lang="ru">Отклонен</value>
@@ -9013,6 +9221,7 @@
         <value xml:lang="fr">Revu</value>
         <value xml:lang="it">Recensita</value>
         <value xml:lang="ja">レビュー済</value>
+        <value xml:lang="nl">Geevalueerd</value>
         <value xml:lang="pt">Revisto</value>
         <value xml:lang="pt-BR">Revisado</value>
         <value xml:lang="ro">Recenzionata</value>
@@ -9029,6 +9238,7 @@
         <value xml:lang="fr">Proposé</value>
         <value xml:lang="it">Sottomesso</value>
         <value xml:lang="ja">実行済</value>
+        <value xml:lang="nl">Ingediend</value>
         <value xml:lang="pt">Submetido</value>
         <value xml:lang="pt-BR">Enviada</value>
         <value xml:lang="ro">Subordonata</value>
@@ -9044,6 +9254,7 @@
         <value xml:lang="fr">Disponible</value>
         <value xml:lang="it">Disponibile</value>
         <value xml:lang="ja">有効</value>
+        <value xml:lang="nl">Beschikbaar</value>
         <value xml:lang="pt-BR">Disponível</value>
         <value xml:lang="ru">Доступен</value>
         <value xml:lang="vi">Có sẵn</value>
@@ -9057,6 +9268,7 @@
         <value xml:lang="fr">Désactivé</value>
         <value xml:lang="it">Disattivato</value>
         <value xml:lang="ja">無効</value>
+        <value xml:lang="nl">Gedeactiveerd</value>
         <value xml:lang="pt">Desactivado</value>
         <value xml:lang="pt-BR">Desativado</value>
         <value xml:lang="ro">Desactivat</value>
@@ -9073,6 +9285,7 @@
         <value xml:lang="fr">Ebauche finale</value>
         <value xml:lang="it">Bozza finale</value>
         <value xml:lang="ja">最終原稿</value>
+        <value xml:lang="nl">Laaste concept</value>
         <value xml:lang="pt">Desenho Final</value>
         <value xml:lang="pt-BR">Rascunho final</value>
         <value xml:lang="ro">Schita Finala</value>
@@ -9089,6 +9302,7 @@
         <value xml:lang="fr">Ebauche initiale</value>
         <value xml:lang="it">Bozza iniziale</value>
         <value xml:lang="ja">初期原稿</value>
+        <value xml:lang="nl">Eerste concept</value>
         <value xml:lang="pt">Desenho Inícial</value>
         <value xml:lang="pt-BR">Projeto inicial</value>
         <value xml:lang="ro">Schita Initiala</value>
@@ -9105,6 +9319,7 @@
         <value xml:lang="fr">En cours</value>
         <value xml:lang="it">In corso</value>
         <value xml:lang="ja">処理中</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt">Em Progresso</value>
         <value xml:lang="pt-BR">Em Andamento</value>
         <value xml:lang="ro">In Curs</value>
@@ -9121,6 +9336,7 @@
         <value xml:lang="fr">Publié</value>
         <value xml:lang="it">Pubblicato</value>
         <value xml:lang="ja">公開</value>
+        <value xml:lang="nl">Gepubliceerd</value>
         <value xml:lang="pt">Publicado</value>
         <value xml:lang="ro">Publicat</value>
         <value xml:lang="ru">Опубликован</value>
@@ -9136,6 +9352,7 @@
         <value xml:lang="fr">Ebauche révisée</value>
         <value xml:lang="it">Bozza revisionata</value>
         <value xml:lang="ja">改定原稿</value>
+        <value xml:lang="nl">Gereviseerd concept</value>
         <value xml:lang="pt">Desenho Revisto</value>
         <value xml:lang="pt-BR">Projeto de revisado</value>
         <value xml:lang="ro">Schita Revizionata</value>
@@ -9363,6 +9580,7 @@
         <value xml:lang="fr">Annulée</value>
         <value xml:lang="it">Cancellato</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt">Cancelado</value>
         <value xml:lang="ro">Sters</value>
         <value xml:lang="ru">Отменено</value>
@@ -9378,6 +9596,7 @@
         <value xml:lang="fr">Terminée</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond/compleet</value>
         <value xml:lang="pt">Completo</value>
         <value xml:lang="pt-BR">Concluída</value>
         <value xml:lang="ro">Completat</value>
@@ -9394,6 +9613,7 @@
         <value xml:lang="fr">Créée</value>
         <value xml:lang="it">Creato</value>
         <value xml:lang="ja">作成</value>
+        <value xml:lang="nl">Aangemaakt</value>
         <value xml:lang="pt">Criado</value>
         <value xml:lang="ro">Creat</value>
         <value xml:lang="ru">Создано</value>
@@ -9409,6 +9629,7 @@
         <value xml:lang="fr">En cours</value>
         <value xml:lang="it">In corso</value>
         <value xml:lang="ja">処理中</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt">Em Progresso</value>
         <value xml:lang="pt-BR">Em Processo</value>
         <value xml:lang="ro">In Curs</value>
@@ -9425,6 +9646,7 @@
         <value xml:lang="fr">Planifiée</value>
         <value xml:lang="it">Schedulato</value>
         <value xml:lang="ja">スケジュール済</value>
+        <value xml:lang="nl">Geagendeerd</value>
         <value xml:lang="pt">Agendado</value>
         <value xml:lang="pt-BR">Agendada</value>
         <value xml:lang="ro">Planificat</value>
@@ -9440,6 +9662,7 @@
         <value xml:lang="fr">Affecté</value>
         <value xml:lang="it">Assegnato</value>
         <value xml:lang="ja">割当済</value>
+        <value xml:lang="nl">Toegewezen</value>
         <value xml:lang="pt-BR">Atribuído</value>
         <value xml:lang="ru">Назначенный</value>
         <value xml:lang="vi">Đã giao việc</value>
@@ -9452,6 +9675,7 @@
         <value xml:lang="fr">Demande refusée</value>
         <value xml:lang="it">Richiesta negata</value>
         <value xml:lang="ja">リクエスト否認</value>
+        <value xml:lang="nl">Toewijzing geweigerd</value>
         <value xml:lang="pt-BR">Pedido negado</value>
         <value xml:lang="ru">В требовании отказано</value>
         <value xml:lang="vi">Từ chối yêu cầu</value>
@@ -9464,6 +9688,7 @@
         <value xml:lang="fr">Demandé</value>
         <value xml:lang="it">Richiesta</value>
         <value xml:lang="ja">リクエスト</value>
+        <value xml:lang="nl">Toewijzing verzocht</value>
         <value xml:lang="pt-BR">Solicitado</value>
         <value xml:lang="ru">Запрошенный</value>
         <value xml:lang="vi">Đã yêu cầu</value>
@@ -9476,6 +9701,7 @@
         <value xml:lang="fr">Actif</value>
         <value xml:lang="it">Attivo</value>
         <value xml:lang="ja">有効</value>
+        <value xml:lang="nl">Actief</value>
         <value xml:lang="pt-BR">Ativo</value>
         <value xml:lang="ru">Действующий</value>
         <value xml:lang="vi">Hoạt động</value>
@@ -9488,6 +9714,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Cancellato</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt-BR">Cancelado</value>
         <value xml:lang="ru">Отмененный</value>
         <value xml:lang="vi">Đã hủy</value>
@@ -9500,6 +9727,7 @@
         <value xml:lang="fr">Bloqué manuellement</value>
         <value xml:lang="it">Congelato manualmente</value>
         <value xml:lang="ja">凍結指示</value>
+        <value xml:lang="nl">Handm. bevroren</value>
         <value xml:lang="pt-BR">Bloqueado Manualmente</value>
         <value xml:lang="ru">Блокировать вручную</value>
         <value xml:lang="vi">Manually Frozen</value>
@@ -9512,6 +9740,7 @@
         <value xml:lang="fr">Replanification en attente</value>
         <value xml:lang="it">Rifornimento in attesa negativo</value>
         <value xml:lang="ja">消極的保留追加</value>
+        <value xml:lang="nl">Negatief, wacht op aanvulling</value>
         <value xml:lang="pt-BR">Reposição pendente Negativa</value>
         <value xml:lang="ru">Изменение расписания</value>
         <value xml:lang="vi">Negative Pending Replenishment</value>
@@ -9631,7 +9860,7 @@
         <value xml:lang="fr">En cours de création</value>
         <value xml:lang="it">In corso</value>
         <value xml:lang="ja">処理中</value>
-        <value xml:lang="nl">In Voorbereiding</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt">Em Processamento</value>
         <value xml:lang="pt-BR">Em processo</value>
         <value xml:lang="ro">In-Curs</value>
@@ -9665,7 +9894,7 @@
         <value xml:lang="fr">Prêt</value>
         <value xml:lang="it">Pronte per contabilizzazione</value>
         <value xml:lang="ja">送付準備完了</value>
-        <value xml:lang="nl">Gereed</value>
+        <value xml:lang="nl">Afgerond/gereed</value>
         <value xml:lang="pt">pronta para Lançamento</value>
         <value xml:lang="pt-BR">Pronto para lançamento</value>
         <value xml:lang="ro">Promte pentru Contabilizare</value>
@@ -9732,6 +9961,7 @@
         <value xml:lang="fr">Activé</value>
         <value xml:lang="it">Attivato</value>
         <value xml:lang="ja">活動済</value>
+        <value xml:lang="nl">Geactiveerd</value>
         <value xml:lang="pt-BR">Ativado</value>
         <value xml:lang="ru">Активированный</value>
         <value xml:lang="vi">Đã hoạt động</value>
@@ -9745,6 +9975,7 @@
         <value xml:lang="fr">Disponible</value>
         <value xml:lang="it">Disponibili</value>
         <value xml:lang="ja">有効</value>
+        <value xml:lang="nl">Beschikbaar</value>
         <value xml:lang="pt">Disponível</value>
         <value xml:lang="ro">Disponibil</value>
         <value xml:lang="ru">Доступна</value>
@@ -9760,6 +9991,7 @@
         <value xml:lang="fr">En cours de transfert</value>
         <value xml:lang="it">In trasferimento</value>
         <value xml:lang="ja">転送中</value>
+        <value xml:lang="nl">Wordt overgedragen</value>
         <value xml:lang="pt">A ser Transferido</value>
         <value xml:lang="pt-BR">Sendo transferido</value>
         <value xml:lang="ro">In Transferiment</value>
@@ -9791,6 +10023,7 @@
         <value xml:lang="fr">Désactivé</value>
         <value xml:lang="it">Disattivato</value>
         <value xml:lang="ja">非活動化</value>
+        <value xml:lang="nl">Gedeactiveerd</value>
         <value xml:lang="pt-BR">Desativado</value>
         <value xml:lang="ru">Деактивированный</value>
         <value xml:lang="vi">Không hoạt động</value>
@@ -9804,6 +10037,7 @@
         <value xml:lang="fr">Défectueux</value>
         <value xml:lang="it">Difettosa</value>
         <value xml:lang="ja">不完全</value>
+        <value xml:lang="nl">Defect</value>
         <value xml:lang="pt">Defeituoso</value>
         <value xml:lang="ro">Defectuoasa</value>
         <value xml:lang="ru">Дефектная</value>
@@ -9819,6 +10053,7 @@
         <value xml:lang="fr">Livré</value>
         <value xml:lang="it">Consegnata</value>
         <value xml:lang="ja">配送済</value>
+        <value xml:lang="nl">Afgeleverd</value>
         <value xml:lang="pt">Entregue</value>
         <value xml:lang="ro">Livrata</value>
         <value xml:lang="ru">Доставлена</value>
@@ -10122,6 +10357,7 @@
         <value xml:lang="en">Approved</value>
         <value xml:lang="fr">Validé</value>
         <value xml:lang="ja">承認</value>
+        <value xml:lang="nl">Goedgekeurd</value>
         <value xml:lang="ru">Утвержденный</value>
         <value xml:lang="vi">Đã duyệt</value>
         <value xml:lang="zh">已批准</value>
@@ -10131,6 +10367,7 @@
         <value xml:lang="en">Rejected</value>
         <value xml:lang="fr">Rejeté</value>
         <value xml:lang="ja">否認</value>
+        <value xml:lang="nl">Afgekeurd</value>
         <value xml:lang="ru">Отклоненный</value>
         <value xml:lang="vi">Từ chối</value>
         <value xml:lang="zh">已拒绝</value>
@@ -10143,6 +10380,7 @@
         <value xml:lang="fr">Approuvée</value>
         <value xml:lang="it">Approvata</value>
         <value xml:lang="ja">承認</value>
+        <value xml:lang="nl">Goedgekeurd</value>
         <value xml:lang="pt">Aprovada</value>
         <value xml:lang="pt-BR">Aprovado</value>
         <value xml:lang="ro">Aprobata</value>
@@ -10159,6 +10397,7 @@
         <value xml:lang="fr">Annulée</value>
         <value xml:lang="it">Cancellata</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Afgekeurd</value>
         <value xml:lang="pt">Cancelada</value>
         <value xml:lang="pt-BR">Cancelado</value>
         <value xml:lang="ro">Stearsa</value>
@@ -10175,6 +10414,7 @@
         <value xml:lang="fr">Terminée</value>
         <value xml:lang="it">Completata</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgesloten</value>
         <value xml:lang="pt">Completa</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ro">Completata</value>
@@ -10191,6 +10431,7 @@
         <value xml:lang="fr">En cours</value>
         <value xml:lang="it">In corso</value>
         <value xml:lang="ja">処理中</value>
+        <value xml:lang="nl">In voortgang</value>
         <value xml:lang="pt">Em  Progresso</value>
         <value xml:lang="pt-BR">Em Andamento</value>
         <value xml:lang="ro">In Curs</value>
@@ -10207,6 +10448,7 @@
         <value xml:lang="fr">Planifiée</value>
         <value xml:lang="it">Pianificata</value>
         <value xml:lang="ja">計画済</value>
+        <value xml:lang="nl">Gepland</value>
         <value xml:lang="pt">Planeada</value>
         <value xml:lang="pt-BR">Planejado</value>
         <value xml:lang="ro">Planificat</value>
@@ -10239,6 +10481,7 @@
         <value xml:lang="fr">Confirmation d'erreur envoyée</value>
         <value xml:lang="it">Errore conferma inviata</value>
         <value xml:lang="ja">送付確認エラー</value>
+        <value xml:lang="nl">Error - verzending confirmatie</value>
         <value xml:lang="pt-BR">Confirmação de erro enviada</value>
         <value xml:lang="ru">Ошибка подтверждения отправки</value>
         <value xml:lang="vi">Lỗi khi xác nhận gửi</value>
@@ -10383,6 +10626,7 @@
         <value xml:lang="fr">Accepté</value>
         <value xml:lang="it">Accettato</value>
         <value xml:lang="ja">受付</value>
+        <value xml:lang="nl">Geaccepteerd</value>
         <value xml:lang="pt">Aceite</value>
         <value xml:lang="pt-BR">Aceita</value>
         <value xml:lang="ro">Acceptat</value>
@@ -10399,6 +10643,7 @@
         <value xml:lang="fr">Prévision acceptée</value>
         <value xml:lang="it">Schedulazione approvata</value>
         <value xml:lang="ja">スケジュール承認</value>
+        <value xml:lang="nl">Goedgekeurd</value>
         <value xml:lang="pt">Prazo Aprovado</value>
         <value xml:lang="pt-BR">Cronograma aprovado</value>
         <value xml:lang="ro">Planificare Aprobata</value>
@@ -10445,6 +10690,7 @@
         <value xml:lang="fr">Transmis au fournisseur</value>
         <value xml:lang="it">Sottoposta al fornitore</value>
         <value xml:lang="ja">サプライヤー実行済</value>
+        <value xml:lang="nl">Ingediend</value>
         <value xml:lang="pt">Fornecedor Submetido</value>
         <value xml:lang="pt-BR">Enviado pelo Fornecedor</value>
         <value xml:lang="ro">Subordinata Furnizorului</value>
@@ -10544,7 +10790,7 @@
         <value xml:lang="fr">En cours</value>
         <value xml:lang="it">In esecuzione</value>
         <value xml:lang="ja">処理中</value>
-        <value xml:lang="nl">Onder handen</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt">A Processar</value>
         <value xml:lang="pt-BR">Processando</value>
         <value xml:lang="ro">In Executie</value>
@@ -10679,6 +10925,7 @@
         <value xml:lang="fr">Assignée</value>
         <value xml:lang="it">Assegnato</value>
         <value xml:lang="ja">割当済</value>
+        <value xml:lang="nl">Toegewezen</value>
         <value xml:lang="pt-BR">Atribuído</value>
         <value xml:lang="ru">Назначенный</value>
         <value xml:lang="vi">Đã giao việc</value>
@@ -10692,6 +10939,7 @@
         <value xml:lang="fr">Terminée</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond/compleet</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ru">Выполненный</value>
         <value xml:lang="vi">Hoàn thành</value>
@@ -10832,6 +11080,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Cancellata</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Pick - geannuleerd</value>
         <value xml:lang="pt-BR">Cancelado</value>
         <value xml:lang="ru">Отмененный</value>
         <value xml:lang="vi">Đã hủy</value>
@@ -10844,6 +11093,7 @@
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="it">Completata</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Pick - afgerond</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ru">Выполненный</value>
         <value xml:lang="vi">Hoàn thành</value>
@@ -10856,6 +11106,7 @@
         <value xml:lang="fr">En attente</value>
         <value xml:lang="it">In attesa</value>
         <value xml:lang="ja">保留</value>
+        <value xml:lang="nl">Pick - wachtend</value>
         <value xml:lang="pt-BR">Pendente</value>
         <value xml:lang="ru">В процессе</value>
         <value xml:lang="vi">Đang đợi</value>
@@ -10869,6 +11120,7 @@
         <value xml:lang="fr">Assignée</value>
         <value xml:lang="it">Assegnata</value>
         <value xml:lang="ja">割当済</value>
+        <value xml:lang="nl">Pick - toegewezen</value>
         <value xml:lang="pt">Atribuida</value>
         <value xml:lang="pt-BR">Atribuído</value>
         <value xml:lang="ro">Atribuita</value>
@@ -10885,6 +11137,7 @@
         <value xml:lang="fr">Annulée</value>
         <value xml:lang="it">Cancellata</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Pick - geannuleerd</value>
         <value xml:lang="pt">Cancelada</value>
         <value xml:lang="pt-BR">Cancelado</value>
         <value xml:lang="ro">Stearsa</value>
@@ -10901,6 +11154,7 @@
         <value xml:lang="fr">Entrée</value>
         <value xml:lang="it">Input</value>
         <value xml:lang="ja">入力</value>
+        <value xml:lang="nl">Picklijst - input</value>
         <value xml:lang="pt">Entrada</value>
         <value xml:lang="ro">Input</value>
         <value xml:lang="ru">Получение</value>
@@ -10916,6 +11170,7 @@
         <value xml:lang="fr">Choisie</value>
         <value xml:lang="it">Prelevata</value>
         <value xml:lang="ja">ピッキング済</value>
+        <value xml:lang="nl">Picklijt - gepickt</value>
         <value xml:lang="pt">Recolhida</value>
         <value xml:lang="pt-BR">Apanhado</value>
         <value xml:lang="ro">Preluata</value>
@@ -10931,6 +11186,7 @@
         <value xml:lang="fr">Imprimée</value>
         <value xml:lang="it">Stampata</value>
         <value xml:lang="ja">印刷済</value>
+        <value xml:lang="nl">Picklijst - afgedrukt</value>
         <value xml:lang="pt-BR">Impresso</value>
         <value xml:lang="ru">Напечатанный</value>
         <value xml:lang="vi">Đã in</value>
@@ -11140,6 +11396,7 @@
         <value xml:lang="fr">Actif</value>
         <value xml:lang="it">Attivo</value>
         <value xml:lang="ja">有効</value>
+        <value xml:lang="nl">Actief</value>
         <value xml:lang="pt-BR">Ativo</value>
         <value xml:lang="ru">Активный</value>
         <value xml:lang="vi">Hoạt động</value>
@@ -11152,6 +11409,7 @@
         <value xml:lang="fr">Fermé</value>
         <value xml:lang="it">Chiuso</value>
         <value xml:lang="ja">終了</value>
+        <value xml:lang="nl">Afgesloten</value>
         <value xml:lang="pt-BR">Fechado</value>
         <value xml:lang="ru">Отменен</value>
         <value xml:lang="vi">Đã đóng</value>
@@ -11164,6 +11422,7 @@
         <value xml:lang="fr">Validé</value>
         <value xml:lang="it">Approvato</value>
         <value xml:lang="ja">承認</value>
+        <value xml:lang="nl">Goedgekeurd</value>
         <value xml:lang="pt-BR">Aprovado</value>
         <value xml:lang="ru">Утвержденный</value>
         <value xml:lang="vi">Đã duyệt</value>
@@ -11176,6 +11435,7 @@
         <value xml:lang="fr">Supprimé</value>
         <value xml:lang="it">Cancellata</value>
         <value xml:lang="ja">削除</value>
+        <value xml:lang="nl">Verwijderd</value>
         <value xml:lang="pt-BR">Excluído</value>
         <value xml:lang="ru">Удален</value>
         <value xml:lang="th">ลบ</value>
@@ -11189,6 +11449,7 @@
         <value xml:lang="fr">En attente</value>
         <value xml:lang="it">Sospesa</value>
         <value xml:lang="ja">保留</value>
+        <value xml:lang="nl">Wachtend</value>
         <value xml:lang="pt-BR">Pendente</value>
         <value xml:lang="ru">В процессе</value>
         <value xml:lang="th">ยังค้างอยู่</value>
@@ -11203,6 +11464,7 @@
         <value xml:lang="fr">Affectée</value>
         <value xml:lang="it">Assegnato</value>
         <value xml:lang="ja">割当済</value>
+        <value xml:lang="nl">Toegewezen</value>
         <value xml:lang="pt">Atribuido</value>
         <value xml:lang="pt-BR">Atribuído</value>
         <value xml:lang="ro">Alocat</value>
@@ -11220,6 +11482,7 @@
         <value xml:lang="fr">Proposée</value>
         <value xml:lang="it">Offerto</value>
         <value xml:lang="ja">提案済</value>
+        <value xml:lang="nl">Aangeboden</value>
         <value xml:lang="pt">Oferecido</value>
         <value xml:lang="pt-BR">Ofertado</value>
         <value xml:lang="ro">Oferit</value>
@@ -11236,6 +11499,7 @@
         <value xml:lang="fr">Non affectée</value>
         <value xml:lang="it">Non assegnato</value>
         <value xml:lang="ja">未割当</value>
+        <value xml:lang="nl">Niet toegewezen</value>
         <value xml:lang="pt">Retirado</value>
         <value xml:lang="pt-BR">Não Atribuído</value>
         <value xml:lang="ro">Ne Alocat</value>
@@ -11252,6 +11516,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Cancellato</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt">Cancelada</value>
         <value xml:lang="pt-BR">Cancelado</value>
         <value xml:lang="ro">Sters</value>
@@ -11268,6 +11533,7 @@
         <value xml:lang="fr">Clos</value>
         <value xml:lang="it">Chiuso</value>
         <value xml:lang="ja">終了</value>
+        <value xml:lang="nl">Afgesloten</value>
         <value xml:lang="pt">Fechada</value>
         <value xml:lang="pt-BR">Fechado</value>
         <value xml:lang="ro">Inchis</value>
@@ -11284,6 +11550,7 @@
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond</value>
         <value xml:lang="pt">Completa</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ro">Completat</value>
@@ -11300,6 +11567,7 @@
         <value xml:lang="fr">Créé</value>
         <value xml:lang="it">Creato</value>
         <value xml:lang="ja">作成</value>
+        <value xml:lang="nl">Aangemaakt</value>
         <value xml:lang="pt">Criada</value>
         <value xml:lang="pt-BR">Criado</value>
         <value xml:lang="ro">Creat</value>
@@ -11316,6 +11584,7 @@
         <value xml:lang="fr">Imprimé</value>
         <value xml:lang="it">Confermato</value>
         <value xml:lang="ja">確認済</value>
+        <value xml:lang="nl">Afgedrukt</value>
         <value xml:lang="pt">Confirmada</value>
         <value xml:lang="pt-BR">Confirmado</value>
         <value xml:lang="ro">Confirmat</value>
@@ -11332,6 +11601,7 @@
         <value xml:lang="fr">En cours</value>
         <value xml:lang="it">In esecuzione</value>
         <value xml:lang="ja">実行中</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt">Em Execução</value>
         <value xml:lang="ro">In Executie</value>
         <value xml:lang="ru">Выполняется</value>
@@ -11346,6 +11616,7 @@
         <value xml:lang="fr">Planifié</value>
         <value xml:lang="it">Schedulato</value>
         <value xml:lang="ja">スケジュール済</value>
+        <value xml:lang="nl">Geagendeerd</value>
         <value xml:lang="pt-BR">Agendado</value>
         <value xml:lang="ru">Плановый</value>
         <value xml:lang="vi">Đã đặt lịch</value>
@@ -11359,6 +11630,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Cancellato</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt-BR">Cancelado</value>
         <value xml:lang="ru">Отменен</value>
         <value xml:lang="vi">Đã hủy</value>
@@ -11372,6 +11644,7 @@
         <value xml:lang="fr">Terminée</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ru">Выполнен</value>
         <value xml:lang="vi">Hoàn thành</value>
@@ -11385,6 +11658,7 @@
         <value xml:lang="fr">Créée</value>
         <value xml:lang="it">Creato</value>
         <value xml:lang="ja">作成</value>
+        <value xml:lang="nl">Aangemaakt</value>
         <value xml:lang="pt-BR">Criado</value>
         <value xml:lang="ru">Создан</value>
         <value xml:lang="vi">Đã tạo</value>
@@ -11398,6 +11672,7 @@
         <value xml:lang="fr">Assignée</value>
         <value xml:lang="it">Assegnato</value>
         <value xml:lang="ja">割当済</value>
+        <value xml:lang="nl">Aangemaakt als</value>
         <value xml:lang="pt-BR">Atribuído</value>
         <value xml:lang="ru">Назначен</value>
         <value xml:lang="vi">Đã giao việc</value>
@@ -11411,6 +11686,7 @@
         <value xml:lang="fr">En cours</value>
         <value xml:lang="it">In corso</value>
         <value xml:lang="ja">処理中</value>
+        <value xml:lang="nl">In voorbereiding</value>
         <value xml:lang="pt-BR">Em Andamento</value>
         <value xml:lang="ru">В процессе</value>
         <value xml:lang="vi">Đang xử lý</value>
@@ -11424,6 +11700,7 @@
         <value xml:lang="fr">Non affectée</value>
         <value xml:lang="it">Non assegnato</value>
         <value xml:lang="ja">未割当</value>
+        <value xml:lang="nl">Niet toegewezen</value>
         <value xml:lang="pt-BR">Não atribuído</value>
         <value xml:lang="ru">Неназначен</value>
         <value xml:lang="vi">Chưa giao việc</value>
@@ -11437,6 +11714,7 @@
         <value xml:lang="fr">En attente</value>
         <value xml:lang="it">In attesa</value>
         <value xml:lang="ja">保留中</value>
+        <value xml:lang="nl">On hold</value>
         <value xml:lang="pt-BR">Em Espera</value>
         <value xml:lang="ru">На удержании</value>
         <value xml:lang="vi">Đang giữ (Hold)</value>
@@ -11450,6 +11728,7 @@
         <value xml:lang="fr">Créé</value>
         <value xml:lang="it">Creata</value>
         <value xml:lang="ja">作成</value>
+        <value xml:lang="nl">Aangemaakt</value>
         <value xml:lang="pt">Criado</value>
         <value xml:lang="ro">Creata</value>
         <value xml:lang="ru">Создана</value>
@@ -11465,6 +11744,7 @@
         <value xml:lang="fr">Reçu</value>
         <value xml:lang="it">Ricevuta</value>
         <value xml:lang="ja">受取</value>
+        <value xml:lang="nl">Ontvangen</value>
         <value xml:lang="pt">Recebido</value>
         <value xml:lang="ro">Primita</value>
         <value xml:lang="ru">Получена</value>
@@ -11480,6 +11760,7 @@
         <value xml:lang="fr">Envoyé</value>
         <value xml:lang="it">Spedita</value>
         <value xml:lang="ja">発送済</value>
+        <value xml:lang="nl">Verzonden</value>
         <value xml:lang="pt">Enviado</value>
         <value xml:lang="ro">Expediata</value>
         <value xml:lang="ru">Поставлена</value>
@@ -11495,6 +11776,7 @@
         <value xml:lang="fr">Approuvé</value>
         <value xml:lang="it">Approvato</value>
         <value xml:lang="ja">承認</value>
+        <value xml:lang="nl">Goedgekeurd</value>
         <value xml:lang="pt">Aprovada</value>
         <value xml:lang="pt-BR">Aprovado</value>
         <value xml:lang="ro">Approbata</value>
@@ -11511,6 +11793,7 @@
         <value xml:lang="fr">Créé</value>
         <value xml:lang="it">Creato</value>
         <value xml:lang="ja">作成</value>
+        <value xml:lang="nl">Aangemaakt</value>
         <value xml:lang="pt">Criada</value>
         <value xml:lang="pt-BR">Criado</value>
         <value xml:lang="ro">Creata</value>
@@ -11527,6 +11810,7 @@
         <value xml:lang="fr">Commandé</value>
         <value xml:lang="it">Ordinato</value>
         <value xml:lang="ja">注文済</value>
+        <value xml:lang="nl">Georderd</value>
         <value xml:lang="pt">Encomendada</value>
         <value xml:lang="pt-BR">Encomendado</value>
         <value xml:lang="ro">Comandata</value>
@@ -11543,6 +11827,7 @@
         <value xml:lang="fr">Rejeté</value>
         <value xml:lang="it">Rifiutato</value>
         <value xml:lang="ja">否認</value>
+        <value xml:lang="nl">Afgewezen</value>
         <value xml:lang="pt">Rejeitada</value>
         <value xml:lang="pt-BR">Rejeitado</value>
         <value xml:lang="ro">Refuzata</value>
@@ -11559,6 +11844,7 @@
         <value xml:lang="fr">Approuvé</value>
         <value xml:lang="it">Approvato</value>
         <value xml:lang="ja">承認</value>
+        <value xml:lang="nl">Goedgekeurd</value>
         <value xml:lang="pt">Aprovado</value>
         <value xml:lang="ro">Aprobat</value>
         <value xml:lang="ru">Утверждено</value>
@@ -11574,6 +11860,7 @@
         <value xml:lang="fr">Créé</value>
         <value xml:lang="it">Creato</value>
         <value xml:lang="ja">作成</value>
+        <value xml:lang="nl">Aangemaakt</value>
         <value xml:lang="pt">Criado</value>
         <value xml:lang="ro">Creat</value>
         <value xml:lang="ru">Создано</value>
@@ -11589,6 +11876,7 @@
         <value xml:lang="fr">Commandé</value>
         <value xml:lang="it">Ordinato</value>
         <value xml:lang="ja">注文済</value>
+        <value xml:lang="nl">Georderd</value>
         <value xml:lang="pt">Encomendado</value>
         <value xml:lang="ro">Comandat</value>
         <value xml:lang="ru">Заказано</value>
@@ -11604,6 +11892,7 @@
         <value xml:lang="fr">Proposée</value>
         <value xml:lang="it">Proposto</value>
         <value xml:lang="ja">提案済</value>
+        <value xml:lang="nl">Voorgesteld</value>
         <value xml:lang="pt-BR">Proposto</value>
         <value xml:lang="ru">Предложено</value>
         <value xml:lang="th">ถูกเสนอ</value>
@@ -11618,6 +11907,7 @@
         <value xml:lang="fr">Rejeté</value>
         <value xml:lang="it">Rifiutato</value>
         <value xml:lang="ja">否認</value>
+        <value xml:lang="nl">Afgewezen</value>
         <value xml:lang="pt">Rejeitado</value>
         <value xml:lang="ro">Refuzat</value>
         <value xml:lang="ru">Отклонено</value>
@@ -11633,6 +11923,7 @@
         <value xml:lang="fr">Accepté</value>
         <value xml:lang="it">Accettato</value>
         <value xml:lang="ja">受付</value>
+        <value xml:lang="nl">Geaccepteerd</value>
         <value xml:lang="pt">Aceite</value>
         <value xml:lang="pt-BR">Aceito</value>
         <value xml:lang="ro">Acceptata</value>
@@ -11649,6 +11940,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Cancellato</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt">Cancelado</value>
         <value xml:lang="ro">Stearsa</value>
         <value xml:lang="ru">Отменен</value>
@@ -11664,6 +11956,7 @@
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond</value>
         <value xml:lang="pt">Completo</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ro">Completata</value>
@@ -11679,6 +11972,7 @@
         <value xml:lang="fr">Remboursement manuel nécessaire</value>
         <value xml:lang="it">Reso manual richiesto</value>
         <value xml:lang="ja">要返金手続</value>
+        <value xml:lang="nl">Handm. terugbetaling</value>
         <value xml:lang="pt-BR">Restituição manual necessária</value>
         <value xml:lang="ru">Ручной запрос возврата</value>
         <value xml:lang="vi">Yêu cầu tự thực hiện hoàn phí</value>
@@ -11692,6 +11986,7 @@
         <value xml:lang="fr">Reçu</value>
         <value xml:lang="it">Ricevuto</value>
         <value xml:lang="ja">受取</value>
+        <value xml:lang="nl">Ontvangen</value>
         <value xml:lang="pt">Recebido</value>
         <value xml:lang="ro">Primita</value>
         <value xml:lang="ru">Получен</value>
@@ -11707,6 +12002,7 @@
         <value xml:lang="fr">Demandé</value>
         <value xml:lang="it">Richiesto</value>
         <value xml:lang="ja">リクエスト</value>
+        <value xml:lang="nl">Verzocht</value>
         <value xml:lang="pt">Requerido</value>
         <value xml:lang="pt-BR">Solicitado</value>
         <value xml:lang="ro">Ceruta</value>
@@ -11717,11 +12013,12 @@
         <value xml:lang="zh-TW">已請求</value>
     </property>
     <property key="StatusItem.description.ROU_ACTIVE">
-        <value xml:lang="en">ROU_ACTIVE</value>
+        <value xml:lang="en">Active</value>
         <value xml:lang="es">Ruta activa</value>
         <value xml:lang="fr">Bien défini et utilisable</value>
         <value xml:lang="it">Attiva</value>
         <value xml:lang="ja">有効</value>
+        <value xml:lang="nl">Actief</value>
         <value xml:lang="pt-BR">Rota ativa</value>
         <value xml:lang="ru">Активный</value>
         <value xml:lang="th">ปฏิบัติการ</value>
@@ -11730,11 +12027,12 @@
         <value xml:lang="zh-TW">有效</value>
     </property>
     <property key="StatusItem.description.ROU_PROD_TEMPLATE">
-        <value xml:lang="en">ROU_PROD_TEMPLATE</value>
+        <value xml:lang="en">Production Template</value>
         <value xml:lang="es">Ruta plantilla de producto</value>
         <value xml:lang="fr">Utilisé en interne pour l'association entre le produit et le cheminement associés</value>
         <value xml:lang="it">Prodotto</value>
         <value xml:lang="ja">製品テンプレート</value>
+        <value xml:lang="nl">Template</value>
         <value xml:lang="pt-BR">ROU_PROD_TEMPLATE</value>
         <value xml:lang="ru">Шаблон продукта</value>
         <value xml:lang="th">เทมเพลต</value>
@@ -11749,6 +12047,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Annullato</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt-BR">Cancelado</value>
         <value xml:lang="ru">Отменен</value>
         <value xml:lang="th">ยกเลิก</value>
@@ -11762,6 +12061,7 @@
         <value xml:lang="fr">Planté</value>
         <value xml:lang="it">Bloccato</value>
         <value xml:lang="ja">クラッシュ</value>
+        <value xml:lang="nl">Gecrasht</value>
         <value xml:lang="pt-BR">Quebrado</value>
         <value xml:lang="ru">Разбившийся</value>
         <value xml:lang="th">เงินสด</value>
@@ -11775,6 +12075,7 @@
         <value xml:lang="fr">Échoué</value>
         <value xml:lang="it">Fallito</value>
         <value xml:lang="ja">失敗</value>
+        <value xml:lang="nl">Gefaald</value>
         <value xml:lang="pt-BR">Falhou</value>
         <value xml:lang="ru">Неудачый</value>
         <value xml:lang="th">ผิดพลาด</value>
@@ -11788,6 +12089,7 @@
         <value xml:lang="fr">Fini</value>
         <value xml:lang="it">Finito</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ru">Законченный</value>
         <value xml:lang="th">เสร็จสิ้น</value>
@@ -11801,6 +12103,7 @@
         <value xml:lang="fr">En attente</value>
         <value xml:lang="it">In attesa</value>
         <value xml:lang="ja">保留</value>
+        <value xml:lang="nl">Wachtend</value>
         <value xml:lang="pt-BR">Pendente</value>
         <value xml:lang="ru">В процессе</value>
         <value xml:lang="th">ยังค้างอยู่</value>
@@ -11814,6 +12117,7 @@
         <value xml:lang="fr">Placé dans la file d'attente</value>
         <value xml:lang="it">In coda</value>
         <value xml:lang="ja">実行待ち</value>
+        <value xml:lang="nl">In de wacht</value>
         <value xml:lang="pt-BR">Enfileirado</value>
         <value xml:lang="ru">Очереди</value>
         <value xml:lang="vi">Đang trong hàng đợi</value>
@@ -11826,6 +12130,7 @@
         <value xml:lang="fr">En cours d'éxécution</value>
         <value xml:lang="it">In esecuzione</value>
         <value xml:lang="ja">実行中</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt-BR">Em execução</value>
         <value xml:lang="ru">Работающий</value>
         <value xml:lang="vi">Đang chạy</value>
@@ -11839,6 +12144,7 @@
         <value xml:lang="fr">Annulée</value>
         <value xml:lang="it">Cancellata</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt">Cancelado</value>
         <value xml:lang="ro">Stearsa</value>
         <value xml:lang="ru">Отменена</value>
@@ -11854,6 +12160,7 @@
         <value xml:lang="fr">Livrée</value>
         <value xml:lang="it">Consegnata</value>
         <value xml:lang="ja">配送済</value>
+        <value xml:lang="nl">Geleverd</value>
         <value xml:lang="pt">Entregue</value>
         <value xml:lang="ro">Livrata</value>
         <value xml:lang="ru">Доставлена</value>
@@ -11869,6 +12176,7 @@
         <value xml:lang="fr">Créée</value>
         <value xml:lang="it">Ingresso</value>
         <value xml:lang="ja">入力</value>
+        <value xml:lang="nl">Input</value>
         <value xml:lang="pt">Entrada</value>
         <value xml:lang="pt-BR">Parâmetro de entrada</value>
         <value xml:lang="ro">Intrare</value>
@@ -11885,6 +12193,7 @@
         <value xml:lang="fr">Empaquetée</value>
         <value xml:lang="it">Imballata</value>
         <value xml:lang="ja">梱包済</value>
+        <value xml:lang="nl">Gepackt/verpakt</value>
         <value xml:lang="pt">Empacotado</value>
         <value xml:lang="pt-BR">Embalado</value>
         <value xml:lang="ro">Ambalata</value>
@@ -11901,6 +12210,7 @@
         <value xml:lang="fr">Prélevée</value>
         <value xml:lang="it">Prelevata</value>
         <value xml:lang="ja">ピッキング済</value>
+        <value xml:lang="nl">Gepickt</value>
         <value xml:lang="pt">Recolhido</value>
         <value xml:lang="ro">Preluata</value>
         <value xml:lang="ru">Сортировка</value>
@@ -11916,6 +12226,7 @@
         <value xml:lang="fr">Planifiée</value>
         <value xml:lang="it">Schedulata</value>
         <value xml:lang="ja">スケジュール済</value>
+        <value xml:lang="nl">Geagendeerd</value>
         <value xml:lang="pt">Agendado</value>
         <value xml:lang="ro">Planificata</value>
         <value xml:lang="ru">Запланировано</value>
@@ -11931,6 +12242,7 @@
         <value xml:lang="fr">Expédiée</value>
         <value xml:lang="it">Spedita</value>
         <value xml:lang="ja">発送済</value>
+        <value xml:lang="nl">Verzonden</value>
         <value xml:lang="pt">Enviado</value>
         <value xml:lang="ro">Expediata</value>
         <value xml:lang="ru">Поставлена</value>
@@ -11945,6 +12257,7 @@
         <value xml:lang="fr">Accepté</value>
         <value xml:lang="it">Accettato</value>
         <value xml:lang="ja">受付</value>
+        <value xml:lang="nl">Geaccepteerd</value>
         <value xml:lang="pt-BR">Aceito</value>
         <value xml:lang="ru">Принят</value>
         <value xml:lang="th">ยอมรับ</value>
@@ -11958,6 +12271,7 @@
         <value xml:lang="fr">Confirmé</value>
         <value xml:lang="it">Confermato</value>
         <value xml:lang="ja">確認済</value>
+        <value xml:lang="nl">Bevestigd</value>
         <value xml:lang="pt-BR">Confirmado</value>
         <value xml:lang="ru">Подтвержденный</value>
         <value xml:lang="th">ยืนยัน</value>
@@ -11971,6 +12285,7 @@
         <value xml:lang="fr">Non commencé</value>
         <value xml:lang="it">Non iniziato</value>
         <value xml:lang="ja">未開始</value>
+        <value xml:lang="nl">Niet gestart</value>
         <value xml:lang="pt-BR">Não iniciado</value>
         <value xml:lang="ru">Не начат</value>
         <value xml:lang="th">ไม่เริ่ม</value>
@@ -11997,6 +12312,7 @@
         <value xml:lang="fr">Accepté</value>
         <value xml:lang="it">Accettato</value>
         <value xml:lang="ja">受付</value>
+        <value xml:lang="nl">Geaccepteerd</value>
         <value xml:lang="pt-BR">Aceito</value>
         <value xml:lang="ru">Полученная ошибка подтверждена</value>
         <value xml:lang="vi">Đã đồng ý</value>
@@ -12009,6 +12325,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Cancellato</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt-BR">Cancelado</value>
         <value xml:lang="ru">Отменен</value>
         <value xml:lang="vi">Đã hủy</value>
@@ -12021,6 +12338,7 @@
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">要返金手続</value>
+        <value xml:lang="nl">Afgerond</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ru">Выполнен</value>
         <value xml:lang="vi">Hoàn thành</value>
@@ -12033,6 +12351,7 @@
         <value xml:lang="fr">Demandé</value>
         <value xml:lang="it">Richiesto</value>
         <value xml:lang="ja">リクエスト</value>
+        <value xml:lang="nl">Verzocht</value>
         <value xml:lang="pt-BR">Solicitado</value>
         <value xml:lang="ru">Запрошенный</value>
         <value xml:lang="vi">Đã yêu cầu</value>
@@ -12045,6 +12364,7 @@
         <value xml:lang="fr">Expédié</value>
         <value xml:lang="it">Spedito</value>
         <value xml:lang="ja">発送済</value>
+        <value xml:lang="nl">Verzonden</value>
         <value xml:lang="pt-BR">Comercializado</value>
         <value xml:lang="ru">Погруженный</value>
         <value xml:lang="vi">Đã chuyển hàng</value>
@@ -12086,6 +12406,7 @@
         <value xml:lang="fr">Terminée</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ru">Выполнен</value>
         <value xml:lang="vi">Hoàn thành</value>
@@ -12098,7 +12419,7 @@
         <value xml:lang="fr">En cours</value>
         <value xml:lang="it">In attesa</value>
         <value xml:lang="ja">処理中</value>
-        <value xml:lang="nl">Onder handen</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt-BR">Em processo</value>
         <value xml:lang="ru">В процессе</value>
         <value xml:lang="vi">Đang xử lý</value>
@@ -12169,6 +12490,7 @@
         <value xml:lang="fr">Disponible</value>
         <value xml:lang="it">Disponibile</value>
         <value xml:lang="ja">有効</value>
+        <value xml:lang="nl">Beschikbaar</value>
         <value xml:lang="pt-BR">Disponível</value>
         <value xml:lang="ru">Доступный</value>
         <value xml:lang="vi">Có sẵn</value>
@@ -12181,6 +12503,7 @@
         <value xml:lang="fr">En cours d'utilisation</value>
         <value xml:lang="it">In uso</value>
         <value xml:lang="ja">使用中</value>
+        <value xml:lang="nl">In gebruik</value>
         <value xml:lang="pt-BR">Em Uso</value>
         <value xml:lang="ru">В использовании</value>
         <value xml:lang="vi">Đang sử dụng</value>
@@ -12193,6 +12516,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Cancellato</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt-BR">Cancelado</value>
         <value xml:lang="ru">Отменен</value>
         <value xml:lang="vi">Đã hủy</value>
@@ -12204,6 +12528,7 @@
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ru">Выполнен</value>
         <value xml:lang="vi">Hoàn thành</value>
@@ -12216,6 +12541,7 @@
         <value xml:lang="fr">Créé</value>
         <value xml:lang="it">Creato</value>
         <value xml:lang="ja">作成</value>
+        <value xml:lang="nl">Aangemaakt</value>
         <value xml:lang="pt-BR">Criado</value>
         <value xml:lang="ru">Создан</value>
         <value xml:lang="vi">Đã tạo</value>
@@ -12228,6 +12554,7 @@
         <value xml:lang="fr">Disponible</value>
         <value xml:lang="it">Disponibile</value>
         <value xml:lang="ja">有効</value>
+        <value xml:lang="nl">Beschikbaar</value>
         <value xml:lang="pt-BR">Disponível</value>
         <value xml:lang="ru">Доступный</value>
         <value xml:lang="vi">Có sẵn</value>
@@ -12252,6 +12579,7 @@
         <value xml:lang="fr">Occupé</value>
         <value xml:lang="it">Occupato</value>
         <value xml:lang="ja">ビジー</value>
+        <value xml:lang="nl">Bezet</value>
         <value xml:lang="pt-BR">Ocupado</value>
         <value xml:lang="ru">Занят</value>
         <value xml:lang="vi">Bận</value>
@@ -12264,6 +12592,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Cancellato</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Geannuleerd</value>
         <value xml:lang="pt-BR">Cancelado</value>
         <value xml:lang="ru">Отменен</value>
         <value xml:lang="vi">Đã hủy</value>
@@ -12276,6 +12605,7 @@
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="it">Completo</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond</value>
         <value xml:lang="pt-BR">Completado</value>
         <value xml:lang="ru">Выполнен</value>
         <value xml:lang="vi">Hoàn thành</value>
@@ -12288,6 +12618,7 @@
         <value xml:lang="fr">En cours</value>
         <value xml:lang="it">In corso</value>
         <value xml:lang="ja">処理中</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt-BR">Em Andamento</value>
         <value xml:lang="ru">В процессе</value>
         <value xml:lang="vi">Đang xử lý</value>
@@ -12300,6 +12631,7 @@
         <value xml:lang="fr">En attente</value>
         <value xml:lang="it">In attesa</value>
         <value xml:lang="ja">保留中</value>
+        <value xml:lang="nl">On hold</value>
         <value xml:lang="pt-BR">Em Espera</value>
         <value xml:lang="ru">На удержание</value>
         <value xml:lang="vi">Đang giữ (Hold)</value>
@@ -12312,6 +12644,7 @@
         <value xml:lang="fr">Planifié</value>
         <value xml:lang="it">Pianificato</value>
         <value xml:lang="ja">計画中</value>
+        <value xml:lang="nl">Planning</value>
         <value xml:lang="pt-BR">Planejamento</value>
         <value xml:lang="ru">Планирование</value>
         <value xml:lang="vi">Đang lập kế hoạch</value>
@@ -12324,6 +12657,7 @@
         <value xml:lang="fr">Approuvé</value>
         <value xml:lang="it">Approvato</value>
         <value xml:lang="ja">承認</value>
+        <value xml:lang="nl">Goedgekeurd</value>
         <value xml:lang="pt-BR">Aprovado</value>
         <value xml:lang="ru">Утвержденный</value>
         <value xml:lang="vi">Đã duyệt</value>
@@ -12336,6 +12670,7 @@
         <value xml:lang="fr">Supprimé</value>
         <value xml:lang="it">Cancellato</value>
         <value xml:lang="ja">削除済</value>
+        <value xml:lang="nl">Verwijderd</value>
         <value xml:lang="pt-BR">Excluído</value>
         <value xml:lang="ru">Удален</value>
         <value xml:lang="vi">Đã xóa</value>
@@ -12348,6 +12683,7 @@
         <value xml:lang="fr">En attente</value>
         <value xml:lang="it">In attesa</value>
         <value xml:lang="ja">保留</value>
+        <value xml:lang="nl">Wachtend</value>
         <value xml:lang="pt-BR">Pendente</value>
         <value xml:lang="ru">В процессе</value>
         <value xml:lang="vi">Đang đợi</value>
@@ -12361,6 +12697,7 @@
         <value xml:lang="fr">Echoué</value>
         <value xml:lang="it">Abortito</value>
         <value xml:lang="ja">中断</value>
+        <value xml:lang="nl">Afgebroken</value>
         <value xml:lang="pt">Abortado</value>
         <value xml:lang="ro">Abandonat</value>
         <value xml:lang="ru">Прерван</value>
@@ -12376,6 +12713,7 @@
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
+        <value xml:lang="nl">Afgerond</value>
         <value xml:lang="pt">Completo</value>
         <value xml:lang="pt-BR">Concluído</value>
         <value xml:lang="ro">Completat</value>
@@ -12392,6 +12730,7 @@
         <value xml:lang="fr">Non commencé</value>
         <value xml:lang="it">Non iniziato</value>
         <value xml:lang="ja">未開始</value>
+        <value xml:lang="nl">Niet gestart</value>
         <value xml:lang="pt">Não Iniiciado</value>
         <value xml:lang="pt-BR">Não Iniciado</value>
         <value xml:lang="ro">Ne Initiat</value>
@@ -12408,6 +12747,7 @@
         <value xml:lang="fr">En cours</value>
         <value xml:lang="it">In esecuzione</value>
         <value xml:lang="ja">実行中</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt">Em Execução</value>
         <value xml:lang="ro">In Executie</value>
         <value xml:lang="ru">Выполняется</value>
@@ -12423,6 +12763,7 @@
         <value xml:lang="fr">Suspendu</value>
         <value xml:lang="it">Sospeso</value>
         <value xml:lang="ja">停止中</value>
+        <value xml:lang="nl">Opgeschort</value>
         <value xml:lang="pt">Suspenso</value>
         <value xml:lang="ro">Suspendat</value>
         <value xml:lang="ru">Приостановлен</value>
@@ -12438,6 +12779,7 @@
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="it">Terminato</value>
         <value xml:lang="ja">終了</value>
+        <value xml:lang="nl">Getermineerd</value>
         <value xml:lang="pt">Terminado</value>
         <value xml:lang="ro">Terminat</value>
         <value xml:lang="ru">Прекращен</value>
@@ -12452,6 +12794,7 @@
         <value xml:lang="fr">En cours : article entrant d'inventaire effectué</value>
         <value xml:lang="it">Entrata terminata</value>
         <value xml:lang="ja">完了収入</value>
+        <value xml:lang="nl">WIP - inkomend gedaan</value>
         <value xml:lang="pt-BR">Entrada terminada</value>
         <value xml:lang="ru">Входящий сделан</value>
         <value xml:lang="th">WIP_INCOMING_DONE</value>
@@ -12465,6 +12808,7 @@
         <value xml:lang="fr">En cours : accomplissement d'article entrant</value>
         <value xml:lang="it">Entrata in completamento</value>
         <value xml:lang="ja">実現収入</value>
+        <value xml:lang="nl">WIP - inkomend fulfilment</value>
         <value xml:lang="pt-BR">Completando entrada</value>
         <value xml:lang="ru">Входящий выполнен</value>
         <value xml:lang="th">WIP_INCOMING_FULFIL</value>
@@ -12478,6 +12822,7 @@
         <value xml:lang="fr">En cours : article estimé à recevoir</value>
         <value xml:lang="it">Entrata pianificata</value>
         <value xml:lang="ja">計画収入</value>
+        <value xml:lang="nl">WIP - inkomend plan</value>
         <value xml:lang="pt-BR">Entrada planejada</value>
         <value xml:lang="ru">Входящий план</value>
         <value xml:lang="th">WIP_INCOMING_PLAN</value>
@@ -12491,6 +12836,7 @@
         <value xml:lang="fr">En cours : article entrant d'inventaire réservé</value>
         <value xml:lang="it">Entrata riservata</value>
         <value xml:lang="ja">残余収入</value>
+        <value xml:lang="nl">WIP - inkomende reservering</value>
         <value xml:lang="pt-BR">Entrada reservada</value>
         <value xml:lang="ru">Входящий результат</value>
         <value xml:lang="th">WIP_INCOMING_RES</value>
@@ -12504,6 +12850,7 @@
         <value xml:lang="fr">En cours : article sortant d'inventaire effectué</value>
         <value xml:lang="it">Uscita terminata</value>
         <value xml:lang="ja">完了支出</value>
+        <value xml:lang="nl">WIP - uitgaand gedaan</value>
         <value xml:lang="pt-BR">Saída terminada</value>
         <value xml:lang="ru">Исходящий сделан</value>
         <value xml:lang="th">WIP_OUTGOING_DONE</value>
@@ -12517,6 +12864,7 @@
         <value xml:lang="fr">En cours : accomplissement d'article sortant</value>
         <value xml:lang="it">Uscita in completamento</value>
         <value xml:lang="ja">実現支出</value>
+        <value xml:lang="nl">WIP - uitgaand fulfilment</value>
         <value xml:lang="pt-BR">Saída em processamento</value>
         <value xml:lang="ru">Исходящий выполнен</value>
         <value xml:lang="th">WIP_OUTGOING_FULFIL</value>
@@ -12530,6 +12878,7 @@
         <value xml:lang="fr">En cours : article sortant estimé</value>
         <value xml:lang="it">Uscita pianificata</value>
         <value xml:lang="ja">計画支出</value>
+        <value xml:lang="nl">WIP - uitgaand plan</value>
         <value xml:lang="pt-BR">Saída planejada</value>
         <value xml:lang="ru">Исходящий план</value>
         <value xml:lang="th">WIP_OUTGOING_PLAN</value>
@@ -12543,6 +12892,7 @@
         <value xml:lang="fr">En cours : article sortant d'inventaire réservé</value>
         <value xml:lang="it">Uscita riservata</value>
         <value xml:lang="ja">残余支出</value>
+        <value xml:lang="nl">WIP - uitgaand reservering</value>
         <value xml:lang="pt-BR">Saída reservada</value>
         <value xml:lang="ru">Исходящий результат</value>
         <value xml:lang="th">WIP_OUTGOING_RES</value>
@@ -12556,6 +12906,7 @@
         <value xml:lang="fr">Publié</value>
         <value xml:lang="it">Pubblicata</value>
         <value xml:lang="ja">公開</value>
+        <value xml:lang="nl">Vrijgegeven</value>
         <value xml:lang="pt-BR">Publicado</value>
         <value xml:lang="ru">Релиз</value>
         <value xml:lang="th">วางจำหน่าย</value>
@@ -12569,6 +12920,7 @@
         <value xml:lang="fr">En cours de révision</value>
         <value xml:lang="it">In revisione</value>
         <value xml:lang="ja">修正中</value>
+        <value xml:lang="nl">In revisie</value>
         <value xml:lang="pt-BR">Sob revisão</value>
         <value xml:lang="ru">В обзоре</value>
         <value xml:lang="th">WPS_UNDER_REVISION</value>
@@ -12582,6 +12934,7 @@
         <value xml:lang="fr">En cours de test</value>
         <value xml:lang="it">In test</value>
         <value xml:lang="ja">テスト中</value>
+        <value xml:lang="nl">In test</value>
         <value xml:lang="pt-BR">Em teste</value>
         <value xml:lang="ru">В тестировании</value>
         <value xml:lang="th">WPS_UNDER_TEST</value>
@@ -12596,7 +12949,7 @@
         <value xml:lang="fr">Non applicable</value>
         <value xml:lang="it">Non applicabile</value>
         <value xml:lang="ja">適用外</value>
-        <value xml:lang="nl">Niet van toepassing</value>
+        <value xml:lang="nl">Niet beschikbaar/Niet van toepassing</value>
         <value xml:lang="pt">Não Aplicável</value>
         <value xml:lang="ro">Ne Aplicabil</value>
         <value xml:lang="ru">Не применимо</value>
@@ -12643,6 +12996,7 @@
         <value xml:lang="fr">Acteur de liste de contact</value>
         <value xml:lang="it">Liste di contatto soggetto</value>
         <value xml:lang="ja">連絡リスト取引先</value>
+        <value xml:lang="nl">Partij</value>
         <value xml:lang="pt">Lista de Contactos de Participante</value>
         <value xml:lang="pt-BR">Lista de contato de participantes</value>
         <value xml:lang="ro">Lista de Contact Subiecti</value>
@@ -12690,6 +13044,7 @@
         <value xml:lang="fr">Evènement</value>
         <value xml:lang="it">Evento</value>
         <value xml:lang="ja">イベント</value>
+        <value xml:lang="nl">Event/gebeurtenis</value>
         <value xml:lang="pt">Evento</value>
         <value xml:lang="ro">Eveniment</value>
         <value xml:lang="ru">Событие</value>
@@ -12705,6 +13060,7 @@
         <value xml:lang="fr">Maintenance d'immobilisation</value>
         <value xml:lang="it">Manutenzione cespiti</value>
         <value xml:lang="ja">固定資産メンテナンス</value>
+        <value xml:lang="nl">Onderhoud activa</value>
         <value xml:lang="pt">Fixed Asset Maintenance</value>
         <value xml:lang="pt-BR">Manutenção de Ativos Fixos</value>
         <value xml:lang="ro">Intretinere Mijloace Fixe</value>
@@ -12721,6 +13077,7 @@
         <value xml:lang="fr">Ligne de stock</value>
         <value xml:lang="it">Riga inventario</value>
         <value xml:lang="ja">在庫アイテム</value>
+        <value xml:lang="nl">Voorraad item</value>
         <value xml:lang="pt">Item de Inventário</value>
         <value xml:lang="ro">Linie Inventar</value>
         <value xml:lang="ru">Позиция ТМЦ</value>
@@ -12736,6 +13093,7 @@
         <value xml:lang="fr">Transfert de stock</value>
         <value xml:lang="it">Inventario per trasferimenti</value>
         <value xml:lang="ja">在庫転送</value>
+        <value xml:lang="nl">Transfer</value>
         <value xml:lang="pt">Transferência de Inventário</value>
         <value xml:lang="ro">Inventar x Trasferari</value>
         <value xml:lang="ru">Перемещение ТМЦ</value>
@@ -12751,7 +13109,7 @@
         <value xml:lang="fr">Statut de facture</value>
         <value xml:lang="it">Stato fattura</value>
         <value xml:lang="ja">在庫ステータス</value>
-        <value xml:lang="nl">Status factuur</value>
+        <value xml:lang="nl">Factuurstatus</value>
         <value xml:lang="pt">Estado da Factura</value>
         <value xml:lang="pt-BR">Estado da fatura</value>
         <value xml:lang="ro">Stare Factura</value>
@@ -12767,6 +13125,7 @@
         <value xml:lang="fr">Ligne de stock sans n° de série</value>
         <value xml:lang="it">Riga inventario non serializzata</value>
         <value xml:lang="ja">一括配送在庫アイテム</value>
+        <value xml:lang="nl">Ongenummerd goed</value>
         <value xml:lang="pt">Item de Inventário não Serializado</value>
         <value xml:lang="pt-BR">Item de estoque não-serializado</value>
         <value xml:lang="ro">Linie Inventar Ne-Serializata</value>
@@ -12782,6 +13141,7 @@
         <value xml:lang="fr">Ligne de stock avec n° de série</value>
         <value xml:lang="it">Riga inventario serializzata</value>
         <value xml:lang="ja">複数配送在庫ステータス</value>
+        <value xml:lang="nl">Genummerd goed</value>
         <value xml:lang="pt">Item de Inventário Serializado</value>
         <value xml:lang="pt-BR">Item de estoque Serializado</value>
         <value xml:lang="ro">Linie Inventar Serializata</value>
@@ -12813,7 +13173,7 @@
         <value xml:lang="fr">planification d'expédition</value>
         <value xml:lang="it">Schedulazione consegne ordini</value>
         <value xml:lang="ja">注文配送スケジュール</value>
-        <value xml:lang="nl">Bestelling verzendschema</value>
+        <value xml:lang="nl">Order - verzendschema</value>
         <value xml:lang="pt">Prazo de Entrega de Encomendas</value>
         <value xml:lang="pt-BR">Programação de entrega do pedido</value>
         <value xml:lang="ro">Planificare Livrari Comenzi</value>
@@ -12830,7 +13190,7 @@
         <value xml:lang="fr">Ligne de commande</value>
         <value xml:lang="it">Riga ordine</value>
         <value xml:lang="ja">注文アイテム</value>
-        <value xml:lang="nl">Bestelling regel</value>
+        <value xml:lang="nl">Order - regel</value>
         <value xml:lang="pt">Item Encomenda</value>
         <value xml:lang="pt-BR">Item do pedido</value>
         <value xml:lang="ro">Linie Comanda</value>
@@ -12846,7 +13206,7 @@
         <value xml:lang="fr">Statut de retour de commande</value>
         <value xml:lang="it">Stato reso ordine</value>
         <value xml:lang="ja">注文返送ステータス</value>
-        <value xml:lang="nl">Bestelling retour status</value>
+        <value xml:lang="nl">Order - retour</value>
         <value xml:lang="pt">Estado da Devolução de Encomendas</value>
         <value xml:lang="pt-BR">Estado do pedido de retorno</value>
         <value xml:lang="ro">Stadiul Comanda Returnata</value>
@@ -12863,7 +13223,7 @@
         <value xml:lang="fr">Commande</value>
         <value xml:lang="it">Ordine</value>
         <value xml:lang="ja">注文</value>
-        <value xml:lang="nl">Bestelling</value>
+        <value xml:lang="nl">Order</value>
         <value xml:lang="pt">Encomenda</value>
         <value xml:lang="pt-BR">Pedido</value>
         <value xml:lang="ro">Comanda</value>
@@ -12896,6 +13256,7 @@
         <value xml:lang="fr">Liste de choix</value>
         <value xml:lang="it">Lista di prelievo</value>
         <value xml:lang="ja">ピッキングリスト</value>
+        <value xml:lang="nl">Picklijst</value>
         <value xml:lang="pt">Lista de Recolha</value>
         <value xml:lang="pt-BR">Lista de itens a recolher</value>
         <value xml:lang="ro">Lista de Preluari</value>
@@ -12912,6 +13273,7 @@
         <value xml:lang="fr">Statut de paiement</value>
         <value xml:lang="it">Stato pagamento</value>
         <value xml:lang="ja">支払ステータス</value>
+        <value xml:lang="nl">Betaling</value>
         <value xml:lang="pt">Estado do Pagamento</value>
         <value xml:lang="pt-BR">Situação do pagamento</value>
         <value xml:lang="ro">Stadiu Plata</value>
@@ -12928,6 +13290,7 @@
         <value xml:lang="fr">Statut d'ordre de fabrication</value>
         <value xml:lang="it">Stato ciclo di produzione</value>
         <value xml:lang="ja">製品実行ステータス</value>
+        <value xml:lang="nl">Productierun</value>
         <value xml:lang="pt">Estado da Produção</value>
         <value xml:lang="pt-BR">Estado da Execução da Produção</value>
         <value xml:lang="ro">Stadii Ciclu Productie</value>
@@ -12959,6 +13322,7 @@
         <value xml:lang="fr">Expédition d'achat</value>
         <value xml:lang="it">Spedizione di acquisto</value>
         <value xml:lang="ja">購入配送</value>
+        <value xml:lang="nl">Inkoop levering</value>
         <value xml:lang="pt">Envio de Compra</value>
         <value xml:lang="pt-BR">Remessa de compra</value>
         <value xml:lang="ro">Expediere Cumparari</value>
@@ -12976,6 +13340,7 @@
         <value xml:lang="fr">Statut de devis</value>
         <value xml:lang="it">Stato preventivo</value>
         <value xml:lang="ja">見積ステータス</value>
+        <value xml:lang="nl">Quote status</value>
         <value xml:lang="pt">Estado da Quotação</value>
         <value xml:lang="pt-BR">Estado da cotação</value>
         <value xml:lang="ro">Stadiu Oferta</value>
@@ -12992,6 +13357,7 @@
         <value xml:lang="fr">Statut de besoin</value>
         <value xml:lang="it">Stato fabbisogno</value>
         <value xml:lang="ja">要求ステータス</value>
+        <value xml:lang="nl">Requirement - status</value>
         <value xml:lang="pt">Estado do Requerimento</value>
         <value xml:lang="pt-BR">Estado da requisição</value>
         <value xml:lang="ro">Stadiu Necesar</value>
@@ -13008,6 +13374,7 @@
         <value xml:lang="fr">Expédition</value>
         <value xml:lang="it">Spedizione</value>
         <value xml:lang="ja">配送ステータス</value>
+        <value xml:lang="nl">Zending - status</value>
         <value xml:lang="pt">Carregamento</value>
         <value xml:lang="pt-BR">Envio</value>
         <value xml:lang="ro">Expediere</value>
@@ -13040,6 +13407,7 @@
         <value xml:lang="fr">Tâche</value>
         <value xml:lang="it">Compito</value>
         <value xml:lang="ja">タスク</value>
+        <value xml:lang="nl">Taak - status</value>
         <value xml:lang="pt">Tarefa</value>
         <value xml:lang="ro">Sarcina</value>
         <value xml:lang="ru">Задача</value>
@@ -13055,6 +13423,7 @@
         <value xml:lang="fr">Workflow</value>
         <value xml:lang="it">Impegno di lavoro</value>
         <value xml:lang="ja">ワークフロー</value>
+        <value xml:lang="nl">Workflow - status</value>
         <value xml:lang="pt">Workflow</value>
         <value xml:lang="pt-BR">Fluxo de trabalho</value>
         <value xml:lang="ro">Sarcini de Lucru</value>
@@ -13071,6 +13440,7 @@
         <value xml:lang="fr">Non applicable</value>
         <value xml:lang="it">Non applicabile</value>
         <value xml:lang="ja">適用外</value>
+        <value xml:lang="nl">Niet beschikbaar/niet van toepassing</value>
         <value xml:lang="pt-BR">Não Aplicável</value>
         <value xml:lang="ru">Неприменяемые</value>
         <value xml:lang="th">ไม่เหมาะสม</value>
@@ -14453,7 +14823,7 @@
         <value xml:lang="fr">Commande arrivée</value>
         <value xml:lang="it">Ordine arrivato</value>
         <value xml:lang="ja">注文到着</value>
-        <value xml:lang="nl">Bestelling aangekomen</value>
+        <value xml:lang="nl">Order aangekomen</value>
         <value xml:lang="pt">Chegou Encomenda</value>
         <value xml:lang="pt-BR">Pedido recebido</value>
         <value xml:lang="ro">Comanda Parvenita</value>
@@ -14969,7 +15339,7 @@
         <value xml:lang="fr">Annuler la commande</value>
         <value xml:lang="it">Cancella ordine</value>
         <value xml:lang="ja">注文取消</value>
-        <value xml:lang="nl">Annuleren bestelling</value>
+        <value xml:lang="nl">Order - annuleren</value>
         <value xml:lang="pt">Cancelar Encomenda</value>
         <value xml:lang="pt-BR">Cancelar Pedido</value>
         <value xml:lang="ro">Sterge Comanda</value>
@@ -14986,7 +15356,7 @@
         <value xml:lang="fr">Compléter la commande</value>
         <value xml:lang="it">Completa ordine</value>
         <value xml:lang="ja">注文完了</value>
-        <value xml:lang="nl">Gereedmaken bestelling</value>
+        <value xml:lang="nl">Order - gereedmaken</value>
         <value xml:lang="pt">Completar Encomenda</value>
         <value xml:lang="pt-BR">Finalizar Pedido</value>
         <value xml:lang="ro">Completeaza Comanda</value>
@@ -15003,7 +15373,7 @@
         <value xml:lang="fr">Prendre la commande</value>
         <value xml:lang="it">Congela ordine</value>
         <value xml:lang="ja">注文保留</value>
-        <value xml:lang="nl">In de wacht zetten bestelling</value>
+        <value xml:lang="nl">Order - on hold zetten</value>
         <value xml:lang="pt">Colocar Encomenda em Espera</value>
         <value xml:lang="pt-BR">Segurar Pedido</value>
         <value xml:lang="ru">Заказ на ожидание</value>
@@ -15019,7 +15389,7 @@
         <value xml:lang="fr">Traiter la commande</value>
         <value xml:lang="it">Processa ordine</value>
         <value xml:lang="ja">注文処理中</value>
-        <value xml:lang="nl">Verwerken bestelling</value>
+        <value xml:lang="nl">Order - verwerken</value>
         <value xml:lang="pt">Hold Order</value>
         <value xml:lang="pt-BR">Processando pedido</value>
         <value xml:lang="ro">Congeleaza comanda</value>
@@ -15036,7 +15406,7 @@
         <value xml:lang="fr">Envoyer la commande</value>
         <value xml:lang="it">Invia ordine</value>
         <value xml:lang="ja">注文送付</value>
-        <value xml:lang="nl">Verzenden bestelling</value>
+        <value xml:lang="nl">Order - verzenden bevestiging</value>
         <value xml:lang="pt">Enviar Encomenda</value>
         <value xml:lang="pt-BR">Enviar Pedido</value>
         <value xml:lang="ro">Trimite Comanda</value>
@@ -15053,7 +15423,7 @@
         <value xml:lang="fr">Approuver la commande</value>
         <value xml:lang="it">Approva ordine</value>
         <value xml:lang="ja">注文承認</value>
-        <value xml:lang="nl">Goedkeuren bestelling</value>
+        <value xml:lang="nl">Order - goedkeuren</value>
         <value xml:lang="pt">Aprovar Encomenda</value>
         <value xml:lang="pt-BR">Aprovar pedido</value>
         <value xml:lang="ro">Aproba Comanda</value>
@@ -15070,7 +15440,7 @@
         <value xml:lang="fr">Annuler la commande</value>
         <value xml:lang="it">Cancella ordine</value>
         <value xml:lang="ja">注文取消</value>
-        <value xml:lang="nl">Annuleren bestelling</value>
+        <value xml:lang="nl">Order - annuleren</value>
         <value xml:lang="pt">Cancelar Encomenda</value>
         <value xml:lang="pt-BR">Cancelar Pedido</value>
         <value xml:lang="ro">Sterge Comanda</value>
@@ -15087,7 +15457,7 @@
         <value xml:lang="fr">Traiter la commande</value>
         <value xml:lang="it">Esegui ordine</value>
         <value xml:lang="ja">注文処理</value>
-        <value xml:lang="nl">Verwerken bestelling</value>
+        <value xml:lang="nl">Order - verwerken</value>
         <value xml:lang="pt">Processar Encomenda</value>
         <value xml:lang="pt-BR">Processar pedido</value>
         <value xml:lang="ro">Executa Comanda</value>
@@ -15104,7 +15474,7 @@
         <value xml:lang="fr">Rejeter la commande</value>
         <value xml:lang="it">Rifiuta ordine</value>
         <value xml:lang="ja">注文否認</value>
-        <value xml:lang="nl">Afwijzen bestelling</value>
+        <value xml:lang="nl">Order - afwijzen</value>
         <value xml:lang="pt">Rejeitar Encomenda</value>
         <value xml:lang="pt-BR">Rejeitar Pedido</value>
         <value xml:lang="ro">Refuza Comanda</value>
@@ -15121,7 +15491,7 @@
         <value xml:lang="fr">Approuver la commande</value>
         <value xml:lang="it">Approva ordine</value>
         <value xml:lang="ja">注文承認</value>
-        <value xml:lang="nl">Bestelling goedkeuren</value>
+        <value xml:lang="nl">Order - goedkeuren</value>
         <value xml:lang="pt">Aprovar Encomenda</value>
         <value xml:lang="pt-BR">Aprovar Pedido</value>
         <value xml:lang="ru">Утвердить заказ</value>
@@ -15137,7 +15507,7 @@
         <value xml:lang="fr">Annuler la commande</value>
         <value xml:lang="it">Cancella ordine</value>
         <value xml:lang="ja">注文取消</value>
-        <value xml:lang="nl">Annuleren bestelling</value>
+        <value xml:lang="nl">Order - annuleren</value>
         <value xml:lang="pt">Cancelar Encomenda</value>
         <value xml:lang="pt-BR">Cancelar Pedido</value>
         <value xml:lang="ru">Отменить заказ</value>
@@ -15153,7 +15523,7 @@
         <value xml:lang="fr">Approuver la commande</value>
         <value xml:lang="it">Approva ordine</value>
         <value xml:lang="ja">注文承認</value>
-        <value xml:lang="nl">Goedkeuren bestelling</value>
+        <value xml:lang="nl">Order - goedkeuren</value>
         <value xml:lang="pt">Aprovar Encomenda</value>
         <value xml:lang="pt-BR">Aprovar Pedido</value>
         <value xml:lang="ro">Aproba Comanda</value>
@@ -15170,7 +15540,7 @@
         <value xml:lang="fr">Annuler la commande</value>
         <value xml:lang="it">Cancella ordine</value>
         <value xml:lang="ja">注文取消</value>
-        <value xml:lang="nl">Annuleren bestelling</value>
+        <value xml:lang="nl">Order - annuleren</value>
         <value xml:lang="pt">Cancelar Encomenda</value>
         <value xml:lang="pt-BR">Cancelar Pedido</value>
         <value xml:lang="ro">Sterge Comanda</value>
@@ -15187,7 +15557,7 @@
         <value xml:lang="fr">Rejeter la commande</value>
         <value xml:lang="it">Rifiuta ordine</value>
         <value xml:lang="ja">注文否認</value>
-        <value xml:lang="nl">Afwijzen bestelling</value>
+        <value xml:lang="nl">Order - afwijzen</value>
         <value xml:lang="pt">Rejeitar Encomenda</value>
         <value xml:lang="pt-BR">Rejeitar Pedido</value>
         <value xml:lang="ro">Refuza Comanda</value>
@@ -15204,7 +15574,7 @@
         <value xml:lang="fr">Commande annulée</value>
         <value xml:lang="it">Ordine cancellato</value>
         <value xml:lang="ja">注文取消</value>
-        <value xml:lang="nl">Bestelling geannuleerd</value>
+        <value xml:lang="nl">Order - geannuleerd</value>
         <value xml:lang="pt">Encomenda Cancelada</value>
         <value xml:lang="pt-BR">Pedido Cancelado</value>
         <value xml:lang="ro">Comanda Stearsa</value>
@@ -15221,7 +15591,7 @@
         <value xml:lang="fr">Commande terminée</value>
         <value xml:lang="it">Ordine completato</value>
         <value xml:lang="ja">注文完了</value>
-        <value xml:lang="nl">Bestelling gereed</value>
+        <value xml:lang="nl">Order - gereed</value>
         <value xml:lang="pt">Encomenda Completa</value>
         <value xml:lang="pt-BR">Pedido Finalizado</value>
         <value xml:lang="ro">Comanda Completata</value>
@@ -15255,7 +15625,7 @@
         <value xml:lang="fr">Paiement annulé</value>
         <value xml:lang="it">Pagamento cancellato</value>
         <value xml:lang="ja">支払取消</value>
-        <value xml:lang="nl">Betaling geannuleerd</value>
+        <value xml:lang="nl">Betaling - annuleren </value>
         <value xml:lang="pt">Pagamento Cancelado</value>
         <value xml:lang="ro">Plata Stearsa</value>
         <value xml:lang="ru">Платеж отменен</value>
@@ -15271,7 +15641,7 @@
         <value xml:lang="fr">Paiement réglé</value>
         <value xml:lang="it">Pagamento saldato</value>
         <value xml:lang="ja">支払解決</value>
-        <value xml:lang="nl">Betaling verrekend</value>
+        <value xml:lang="nl">Betaling - verrekenen</value>
         <value xml:lang="pt">Pagamento Acordado</value>
         <value xml:lang="pt-BR">Pagamento combinado</value>
         <value xml:lang="ro">Plata Achitata</value>
@@ -15288,7 +15658,7 @@
         <value xml:lang="fr">Paiement autorisé</value>
         <value xml:lang="it">Pagamento autorizzato</value>
         <value xml:lang="ja">支払承認</value>
-        <value xml:lang="nl">Betaling geautoriseerd</value>
+        <value xml:lang="nl">Betaling - autoriseren</value>
         <value xml:lang="pt">Pagamento Autorizado</value>
         <value xml:lang="ro">Plata Autorizata</value>
         <value xml:lang="ru">Платеж авторизирован</value>
@@ -15302,7 +15672,7 @@
         <value xml:lang="en">Payment Cancelled</value>
         <value xml:lang="es">Pago cancelado</value>
         <value xml:lang="fr">Paiement annulé</value>
-        <value xml:lang="it">Pagamento cancellato</value>
+        <value xml:lang="it">Pagamento - annuleren</value>
         <value xml:lang="ja">支払取消</value>
         <value xml:lang="nl">Betaling geannuleerd</value>
         <value xml:lang="pt">Pagamento Cancelado</value>
@@ -15320,7 +15690,7 @@
         <value xml:lang="fr">Paiement annulé</value>
         <value xml:lang="it">Pagamento cancellato</value>
         <value xml:lang="ja">支払取消</value>
-        <value xml:lang="nl">Betaling geannuleerd</value>
+        <value xml:lang="nl">Betaling - annuleren</value>
         <value xml:lang="pt">Pagamento Cancelado</value>
         <value xml:lang="ro">Plata Stearsa</value>
         <value xml:lang="ru">Платеж отменен</value>
@@ -15336,7 +15706,7 @@
         <value xml:lang="fr">Paiement reçu</value>
         <value xml:lang="it">Pagamento ricevuto</value>
         <value xml:lang="ja">支払受取</value>
-        <value xml:lang="nl">Betaling ontvangen</value>
+        <value xml:lang="nl">Betaling - ontvangen</value>
         <value xml:lang="pt">Pagamento Recebido</value>
         <value xml:lang="ro">Plata Primita</value>
         <value xml:lang="ru">Платеж получен</value>
@@ -15352,6 +15722,7 @@
         <value xml:lang="fr">Annuler</value>
         <value xml:lang="it">Cancella</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Picklijst - annuleren</value>
         <value xml:lang="pt">Cancelar</value>
         <value xml:lang="ro">Sterge</value>
         <value xml:lang="ru">Отменить</value>
@@ -15367,6 +15738,7 @@
         <value xml:lang="fr">Prélever</value>
         <value xml:lang="it">Preleva</value>
         <value xml:lang="ja">ピッキング</value>
+        <value xml:lang="nl">Picklijst - gepickt</value>
         <value xml:lang="pt">Recolher</value>
         <value xml:lang="ro">Preleva</value>
         <value xml:lang="ru">Сортировать</value>
@@ -15380,6 +15752,7 @@
         <value xml:lang="es">Impreso</value>
         <value xml:lang="fr">Imprimé</value>
         <value xml:lang="it">Stampa</value>
+        <value xml:lang="nl">Picklijst - geprint</value>
         <value xml:lang="ru">Напечатанный</value>
         <value xml:lang="ja">印刷済</value>
         <value xml:lang="pt-BR">Impresso</value>
@@ -15393,6 +15766,7 @@
         <value xml:lang="fr">Attribuer</value>
         <value xml:lang="it">Assegna</value>
         <value xml:lang="ja">割当</value>
+        <value xml:lang="nl">Picklijst - toegewezen</value>
         <value xml:lang="pt">Atribuir</value>
         <value xml:lang="ro">Atribuie</value>
         <value xml:lang="ru">Назначить</value>
@@ -15408,6 +15782,7 @@
         <value xml:lang="fr">Annuler</value>
         <value xml:lang="it">Cancella</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Picklijst - geannuleerd</value>
         <value xml:lang="pt">Cancelar</value>
         <value xml:lang="ro">Sterge</value>
         <value xml:lang="ru">Отменить</value>
@@ -15423,6 +15798,7 @@
         <value xml:lang="fr">Prélever</value>
         <value xml:lang="it">Preleva</value>
         <value xml:lang="ja">ピッキング</value>
+        <value xml:lang="nl">Picklijst - gepickt</value>
         <value xml:lang="pt">Recolher</value>
         <value xml:lang="ro">Preluare</value>
         <value xml:lang="ru">Сортировать</value>
@@ -15436,6 +15812,7 @@
         <value xml:lang="es">Imprimir</value>
         <value xml:lang="fr">Imprimer</value>
         <value xml:lang="it">Stampa</value>
+        <value xml:lang="nl">Picklijst - afgedrukt</value>
         <value xml:lang="ru">Печатать</value>
         <value xml:lang="ja">印刷</value>
         <value xml:lang="pt-BR">Imprimir</value>
@@ -15448,6 +15825,7 @@
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Cancella</value>
         <value xml:lang="ja">取消</value>
+        <value xml:lang="nl">Picklijst - geannuleerd</value>
         <value xml:lang="pt-BR">Cancelar</value>
         <value xml:lang="ru">Отмена</value>
         <value xml:lang="vi">Hủy bỏ</value>
@@ -15460,6 +15838,7 @@
         <value xml:lang="fr">Prélevé</value>
         <value xml:lang="it">Preleva</value>
         <value xml:lang="ja">ピッキング</value>
+        <value xml:lang="nl">Picklijst - gepickt</value>
         <value xml:lang="pt-BR">Recolher</value>
         <value xml:lang="ru">Выбирать</value>
         <value xml:lang="vi">Chọn ra (pick)</value>
@@ -15473,7 +15852,7 @@
         <value xml:lang="fr">Paiement annulé</value>
         <value xml:lang="it">Pagamento cancellato</value>
         <value xml:lang="ja">支払取消</value>
-        <value xml:lang="nl">Betaling geannuleerd</value>
+        <value xml:lang="nl">Betaling - geannuleerd</value>
         <value xml:lang="pt">Pagamento Cancelado</value>
         <value xml:lang="ro">Plata Stearsa</value>
         <value xml:lang="ru">Платеж отменен</value>
@@ -15489,7 +15868,7 @@
         <value xml:lang="fr">Paiement reçu</value>
         <value xml:lang="it">Pagamento ricevuto</value>
         <value xml:lang="ja">支払受取</value>
-        <value xml:lang="nl">Betaling ontvangen</value>
+        <value xml:lang="nl">Betaling - ontvangen</value>
         <value xml:lang="pt">Pagamento Recebido</value>
         <value xml:lang="ro">Plata Primita</value>
         <value xml:lang="ru">Платеж получен</value>
@@ -15505,7 +15884,7 @@
         <value xml:lang="fr">Paiement envoyé</value>
         <value xml:lang="it">Pagamento inviato</value>
         <value xml:lang="ja">支払送付</value>
-        <value xml:lang="nl">Betaling verstuurd</value>
+        <value xml:lang="nl">Betaling - verstuurd</value>
         <value xml:lang="pt">Pagamento Enviado</value>
         <value xml:lang="ro">Plata Trimisa</value>
         <value xml:lang="ru">Платеж отослан</value>
@@ -15521,7 +15900,7 @@
         <value xml:lang="fr">Paiement confirmé</value>
         <value xml:lang="it">Pagamento confermato</value>
         <value xml:lang="ja">支払確認済</value>
-        <value xml:lang="nl">Betaling bevestigd</value>
+        <value xml:lang="nl">Betaling - bevestigd</value>
         <value xml:lang="pt">Pagamento Confirmado</value>
         <value xml:lang="ro">Plata Confirmata</value>
         <value xml:lang="ru">Платеж подтвержден</value>
@@ -15537,7 +15916,7 @@
         <value xml:lang="fr">Paiement confirmé</value>
         <value xml:lang="it">Pagamento confermato</value>
         <value xml:lang="ja">支払確認済</value>
-        <value xml:lang="nl">Betaling bevestigd</value>
+        <value xml:lang="nl">Betaling - bevestigd</value>
         <value xml:lang="pt">Pagamento Confirmado</value>
         <value xml:lang="ro">Plata Confirmata</value>
         <value xml:lang="ru">Платеж подтвержден</value>
@@ -15600,6 +15979,7 @@
         <value xml:lang="fr">Révision</value>
         <value xml:lang="it">Ricevuto</value>
         <value xml:lang="ja">受取</value>
+        <value xml:lang="nl">Inkoop - ontvangen</value>
         <value xml:lang="pt">Receber</value>
         <value xml:lang="ro">Primit</value>
         <value xml:lang="ru">Получить</value>
@@ -15615,6 +15995,7 @@
         <value xml:lang="fr">Transport</value>
         <value xml:lang="it">Spedita</value>
         <value xml:lang="ja">発送</value>
+        <value xml:lang="nl">Inkoop - verzonden</value>
         <value xml:lang="pt">Expedir</value>
         <value xml:lang="pt-BR">Enviar</value>
         <value xml:lang="ro">Expediat</value>
@@ -15631,6 +16012,7 @@
         <value xml:lang="fr">Reçu</value>
         <value xml:lang="it">Ricevuto</value>
         <value xml:lang="ja">受取</value>
+        <value xml:lang="nl">Inkoop - ontvangen</value>
         <value xml:lang="pt">Receber</value>
         <value xml:lang="ro">Primit</value>
         <value xml:lang="ru">Получить</value>
@@ -15647,6 +16029,7 @@
         <value xml:lang="fr">Devis de commande</value>
         <value xml:lang="it">Preventivo ordine</value>
         <value xml:lang="ja">見積注文</value>
+        <value xml:lang="nl">Quote - georderd</value>
         <value xml:lang="pt">Encomendar Citação</value>
         <value xml:lang="pt-BR">Cotação de pedido</value>
         <value xml:lang="ro">Oferta Comanda</value>
@@ -15664,6 +16047,7 @@
         <value xml:lang="fr">Rejeter le devis</value>
         <value xml:lang="it">Preventivo rifiutato</value>
         <value xml:lang="ja">見積否認</value>
+        <value xml:lang="nl">Quote - afgewezen</value>
         <value xml:lang="pt">Rejeitar Citação</value>
         <value xml:lang="pt-BR">Rejeitar Cotação</value>
         <value xml:lang="ro">Oferta Refuzata</value>
@@ -15681,6 +16065,7 @@
         <value xml:lang="fr">Accepter le devis</value>
         <value xml:lang="it">Preventivo accettato</value>
         <value xml:lang="ja">見積承認</value>
+        <value xml:lang="nl">Quote - goedgekeurd</value>
         <value xml:lang="pt">Aceitar Citação</value>
         <value xml:lang="pt-BR">Aceitar Cotação</value>
         <value xml:lang="ro">Oferta Acceptata</value>
@@ -15697,6 +16082,7 @@
         <value xml:lang="fr">Rejeter le devis</value>
         <value xml:lang="it">Preventivo rifiutato</value>
         <value xml:lang="ja">見積否認</value>
+        <value xml:lang="nl">Quote - afgewezen</value>
         <value xml:lang="pt">Rejeitar Citação</value>
         <value xml:lang="pt-BR">Rejeitar Cotação</value>
         <value xml:lang="ro">Oferta Refuzat</value>
@@ -15713,6 +16099,7 @@
         <value xml:lang="fr">Condition de commande</value>
         <value xml:lang="it">Fabbisogno ordine</value>
         <value xml:lang="ja">要求注文</value>
+        <value xml:lang="nl">Req. - georderd</value>
         <value xml:lang="pt">Encomendar Requerimento</value>
         <value xml:lang="pt-BR">Requisição de pedido</value>
         <value xml:lang="ro">Necesar Comanda</value>
@@ -15729,6 +16116,7 @@
         <value xml:lang="fr">Rejeter la condition</value>
         <value xml:lang="it">Fabbisogno rifiutato</value>
         <value xml:lang="ja">要求否認</value>
+        <value xml:lang="nl">Req. - afgewezen</value>
         <value xml:lang="pt">Rejeitar Requerimento</value>
         <value xml:lang="pt-BR">Rejeitar Requisição</value>
         <value xml:lang="ro">Necesar Refuzat</value>
@@ -15745,6 +16133,7 @@
         <value xml:lang="fr">Accepter la condition</value>
         <value xml:lang="it">Fabbisogno accettato</value>
         <value xml:lang="ja">要求承認</value>
+        <value xml:lang="nl">Req. - goedgekeurd</value>
         <value xml:lang="pt">Aceitar Requerimento</value>
         <value xml:lang="pt-BR">Aceitar a requisição</value>
         <value xml:lang="ro">Necesar Acceptato</value>
@@ -15761,6 +16150,7 @@
         <value xml:lang="fr">Rejeter la condition</value>
         <value xml:lang="it">Fabbisogno rifiutato</value>
         <value xml:lang="ja">要求否認</value>
+        <value xml:lang="nl">Req. - afgewezen</value>
         <value xml:lang="pt">Rejeitar Requerimento</value>
         <value xml:lang="pt-BR">Rejeitar Exigência</value>
         <value xml:lang="ro">Necesar Refuzat</value>
@@ -15794,7 +16184,7 @@
         <value xml:lang="fr">Retour reçu et accepté</value>
         <value xml:lang="it">Accettata reso ricevuto</value>
         <value xml:lang="ja">受取返却受付</value>
-        <value xml:lang="nl">Geaccepteerde retourzending ontvangen</value>
+        <value xml:lang="nl">VerkoopRetour - ontvangen</value>
         <value xml:lang="pt">Devolução Recebida Aceite</value>
         <value xml:lang="pt-BR">Retorno Aceito Recebido</value>
         <value xml:lang="ro">Acceptatre Rturnare Primita</value>
@@ -15811,7 +16201,7 @@
         <value xml:lang="fr">Retour reçu et annulé</value>
         <value xml:lang="it">Ricevuto reso cancellato</value>
         <value xml:lang="ja">返却受取取消</value>
-        <value xml:lang="nl">Ontvangen retourzending geannuleerd</value>
+        <value xml:lang="nl">VerkoopRetour -  geannuleerd</value>
         <value xml:lang="pt">Devolução Recebida Cancelada</value>
         <value xml:lang="pt-BR">Recebido Retorno Cancelado</value>
         <value xml:lang="ro">Primit Returnare Stearsa</value>
@@ -15828,7 +16218,7 @@
         <value xml:lang="fr">Retour reçu et terminé</value>
         <value xml:lang="it">Ricevuto reso completato</value>
         <value xml:lang="ja">返却受取完了</value>
-        <value xml:lang="nl">Ontvangen retourzending gereed</value>
+        <value xml:lang="nl">VerkoopRetour - afgerond</value>
         <value xml:lang="pt">Devolução Recebida Completa</value>
         <value xml:lang="pt-BR">Recebido Devolução</value>
         <value xml:lang="ro">Primit Returnare Completa</value>
@@ -15845,7 +16235,7 @@
         <value xml:lang="fr">Retour demandé et accepté</value>
         <value xml:lang="it">Richiesta reso accettata</value>
         <value xml:lang="ja">返品リクエスト受付</value>
-        <value xml:lang="nl">Aangevraagde retourzending geaccpeteerd</value>
+        <value xml:lang="nl">VerkoopRetour - geaccepteerd</value>
         <value xml:lang="pt">Devolução Pedida Aceite</value>
         <value xml:lang="pt-BR">Retorno Requerida aceitado</value>
         <value xml:lang="ro">Cerere Returnari Acceptata</value>
@@ -15862,7 +16252,7 @@
         <value xml:lang="fr">Retour demandé, annulé</value>
         <value xml:lang="it">Richiesta reso cancellata</value>
         <value xml:lang="ja">返品リクエスト取消</value>
-        <value xml:lang="nl">Aangevraagde retourzending geannuleerd</value>
+        <value xml:lang="nl">VerkoopRetour - geannuleerd</value>
         <value xml:lang="pt">Devolução Pedida Cancelada</value>
         <value xml:lang="pt-BR">Retorno Requerida Cancelado</value>
         <value xml:lang="ro">Cerere Returnari Stearsa</value>
@@ -15929,7 +16319,7 @@
         <value xml:lang="fr">Programmer</value>
         <value xml:lang="it">Schedula</value>
         <value xml:lang="ja">スケジュール</value>
-        <value xml:lang="nl">Ingepland</value>
+        <value xml:lang="nl">Inplannen</value>
         <value xml:lang="pt">Agendar</value>
         <value xml:lang="pt-BR">Agenda</value>
         <value xml:lang="ro">Pagina</value>
diff --git a/framework/common/config/CommonUiLabels.xml b/framework/common/config/CommonUiLabels.xml
index 64214ad..ec3184e 100644
--- a/framework/common/config/CommonUiLabels.xml
+++ b/framework/common/config/CommonUiLabels.xml
@@ -18,6 +18,7 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+
     <property key="Accounting - AP">
         <value xml:lang="cs">Závazky</value>
         <value xml:lang="de">Kreditoren</value>
@@ -34,6 +35,7 @@
         <value xml:lang="zh">应付账户</value>
         <value xml:lang="zh-TW">應付帳款</value>
     </property>
+
     <property key="Accounting - AR">
         <value xml:lang="cs">Pohledávky</value>
         <value xml:lang="de">Debitoren</value>
@@ -1908,7 +1910,7 @@
         <value xml:lang="hi-IN">पूर्ण</value>
         <value xml:lang="it">Completato</value>
         <value xml:lang="ja">完了</value>
-        <value xml:lang="nl">Volledig</value>
+        <value xml:lang="nl">Gereed</value>
         <value xml:lang="pt">Completo</value>
         <value xml:lang="pt-BR">Concluída</value>
         <value xml:lang="ro">Completat</value>
@@ -1956,11 +1958,12 @@
     </property>
     <property key="CommonConfirm">
         <value xml:lang="cs">Potvrzujete ?</value>
-        <value xml:lang="en">Do you confirm ?</value>
+        <value xml:lang="en">Do you confirm?</value>
         <value xml:lang="es">¿Está seguro?</value>
         <value xml:lang="fr">Vous confirmez ?</value>
         <value xml:lang="it">Confermi ?</value>
         <value xml:lang="ja">確認しましたか?</value>
+        <value xml:lang="nl">Bevestigen?</value>
         <value xml:lang="pt-BR">Você confirma?</value>
         <value xml:lang="ru">Вы подтверждаете?</value>
         <value xml:lang="vi">Bạn có xác nhận không?</value>
@@ -2014,7 +2017,7 @@
         <value xml:lang="hi-IN">संपर्क यांत्रिक क्रमांक(ContactMechId)</value>
         <value xml:lang="it">Contatto</value>
         <value xml:lang="ja">問い合わせ方法ID</value>
-        <value xml:lang="nl">Kontact Mech Nr</value>
+        <value xml:lang="nl">Contact Mech ID</value>
         <value xml:lang="pt">ContactMechId</value>
         <value xml:lang="pt-BR">Código de mecanismo de contato (ContactMechId)</value>
         <value xml:lang="ro">Contact</value>
@@ -2307,6 +2310,10 @@
         <value xml:lang="zh-CN">县市</value>
         <value xml:lang="zh-TW">縣城</value>
     </property>
+    <property key="CommonCost">
+        <value xml:lang="en">Cost</value>
+        <value xml:lang="nl">Kosten</value>
+    </property>
     <property key="CommonCreate">
         <value xml:lang="ar">استحداث</value>
         <value xml:lang="cs">Založit</value>
@@ -3580,6 +3587,33 @@
         <value xml:lang="zh">提交表单时发生了一个错误。</value>
         <value xml:lang="zh-TW">提交表單時發生了一個錯誤.</value>
     </property>
+    <property key="CommonEstimatedCompletionDate">
+        <value xml:lang="de">Soll-Enddatum</value>
+        <value xml:lang="en">Estimated Completion Date</value>
+        <value xml:lang="fr">Date estimée d'achèvement</value>
+        <value xml:lang="it">Data completamento stimata</value>
+        <value xml:lang="ja">予定完了日</value>
+        <value xml:lang="nl">Gepl. datum afgerond</value>
+        <value xml:lang="ro">Data Terminare Stimata</value>
+        <value xml:lang="th">วันที่สำเร็จประมาณ</value>
+        <value xml:lang="vi">Ngày hoàn thành dự tính</value>
+        <value xml:lang="zh">预计完成日期</value>
+        <value xml:lang="zh-TW">預計完成日期</value>
+    </property>
+    <property key="CommonEstimatedStartDate">
+        <value xml:lang="de">Soll-Anfangsdatum</value>
+        <value xml:lang="en">Estimated Start Date</value>
+        <value xml:lang="es">Fecha de comienzo estimada</value>
+        <value xml:lang="fr">Date estimée de début</value>
+        <value xml:lang="it">Data inizio stimata</value>
+        <value xml:lang="ja">予定開始日</value>
+        <value xml:lang="nl">Datum start</value>
+        <value xml:lang="ro">Data Initiere Stimata</value>
+        <value xml:lang="th">วันที่เริ่มประมาณ</value>
+        <value xml:lang="vi">Ngày bắt đầu dự tính</value>
+        <value xml:lang="zh">预计开始日期</value>
+        <value xml:lang="zh-TW">預計開始日期</value>
+    </property>
     <property key="CommonEventDate">
         <value xml:lang="ar">تاريخ الحدث</value>
         <value xml:lang="cs">Datum konání</value>
@@ -4988,6 +5022,7 @@
         <value xml:lang="hi-IN">पकड़ा</value>
         <value xml:lang="it">Congelati</value>
         <value xml:lang="ja">保留</value>
+        <value xml:lang="nl">Geblokkeerd</value>
         <value xml:lang="pt">Preso/Bloqueado</value>
         <value xml:lang="pt-BR">Suspenso</value>
         <value xml:lang="ru">Приостановленные</value>
@@ -5115,6 +5150,15 @@
         <value xml:lang="zh">每小时</value>
         <value xml:lang="zh-TW">每小時</value>
     </property>
+    <property key="CommonHours">
+        <value xml:lang="de">Stunden</value>
+        <value xml:lang="en">Hours</value>
+        <value xml:lang="es">Hora</value>
+        <value xml:lang="fr">Heure</value>
+        <value xml:lang="it">Ora</value>
+        <value xml:lang="ja">時間</value>
+        <value xml:lang="nl">Uren</value>
+    </property>
     <property key="CommonId">
         <value xml:lang="ar">دليل</value>
         <value xml:lang="en">ID</value>
@@ -5816,6 +5860,10 @@
         <value xml:lang="zh">本地化</value>
         <value xml:lang="zh-TW">當地語系化</value>
     </property>
+    <property key="CommonLocation">
+        <value xml:lang="en">Location</value>
+        <value xml:lang="nl">Locatie</value>
+    </property>
     <property key="CommonLogin">
         <value xml:lang="ar">دخول</value>
         <value xml:lang="cs">Přihlásit</value>
@@ -6023,7 +6071,7 @@
         <value xml:lang="hi-IN">मुख्य</value>
         <value xml:lang="it">Pagina principale</value>
         <value xml:lang="ja">メイン</value>
-        <value xml:lang="nl">HoofdMenu</value>
+        <value xml:lang="nl">Hoofdmenu</value>
         <value xml:lang="pt">Início</value>
         <value xml:lang="pt-BR">Principal</value>
         <value xml:lang="pt-PT">Entrada</value>
@@ -6084,14 +6132,12 @@
     <property key="CommonManager">
         <value xml:lang="ar">مدير</value>
         <value xml:lang="cs">Správce</value>
-        <value xml:lang="de">Manager</value>
         <value xml:lang="en">Manager</value>
         <value xml:lang="es">Administrador</value>
         <value xml:lang="fr">Responsable</value>
         <value xml:lang="hi-IN">प्रबंधक</value>
         <value xml:lang="it">Responsabile</value>
         <value xml:lang="ja">管理者</value>
-        <value xml:lang="nl">Manager</value>
         <value xml:lang="pt">Gerente</value>
         <value xml:lang="ro">Manager</value>
         <value xml:lang="ru">Менеджер</value>
@@ -7427,7 +7473,7 @@
         <value xml:lang="hi-IN">नोट्स</value>
         <value xml:lang="it">Note</value>
         <value xml:lang="ja">連絡</value>
-        <value xml:lang="nl">Nota's</value>
+        <value xml:lang="nl">Notities</value>
         <value xml:lang="pt">Notas</value>
         <value xml:lang="ro">Note</value>
         <value xml:lang="ru">Заметки</value>
@@ -7771,7 +7817,7 @@
         <value xml:lang="hi-IN">आदेश</value>
         <value xml:lang="it">Ordine</value>
         <value xml:lang="ja">注文</value>
-        <value xml:lang="nl">Bestelling</value>
+        <value xml:lang="nl">Order</value>
         <value xml:lang="pt">Ordenar</value>
         <value xml:lang="pt-BR">Pedido</value>
         <value xml:lang="ro">Comanda</value>
@@ -7792,7 +7838,7 @@
         <value xml:lang="hi-IN">आदेश से</value>
         <value xml:lang="it">Ordinato da</value>
         <value xml:lang="ja">並び順</value>
-        <value xml:lang="nl">Bestelling Door</value>
+        <value xml:lang="nl">Order Door</value>
         <value xml:lang="pt">Ordenar Por</value>
         <value xml:lang="ro">Comandat de la</value>
         <value xml:lang="ru">Сортировка</value>
@@ -7812,7 +7858,7 @@
         <value xml:lang="hi-IN">आदेश</value>
         <value xml:lang="it">Ordini</value>
         <value xml:lang="ja">注文</value>
-        <value xml:lang="nl">Bestellingen</value>
+        <value xml:lang="nl">Orders</value>
         <value xml:lang="pt">Encomendas</value>
         <value xml:lang="pt-BR">Pedidos</value>
         <value xml:lang="ro">Comenzi</value>
@@ -7888,6 +7934,10 @@
         <value xml:lang="zh">概览</value>
         <value xml:lang="zh-TW">概覽</value>
     </property>
+    <property key="CommonOwner">
+        <value xml:lang="en">Owner</value>
+        <value xml:lang="nl">Eigenaar</value>
+    </property>
     <property key="CommonPage">
         <value xml:lang="ar">صفحة</value>
         <value xml:lang="cs">Strana</value>
@@ -8142,6 +8192,10 @@
         <value xml:lang="zh-CN">执行</value>
         <value xml:lang="zh-TW">執行</value>
     </property>
+    <property key="CommonPeriod">
+        <value xml:lang="en">Period</value>
+        <value xml:lang="nl">Periode</value>
+    </property>
     <property key="CommonPermissionError">
         <value xml:lang="ar">خطأ في الرخصة</value>
         <value xml:lang="cs">Chyba oprávnění</value>
@@ -8556,13 +8610,14 @@
     <property key="CommonPrint">
         <value xml:lang="ar">نسخ</value>
         <value xml:lang="cs">Tisk</value>
-        <value xml:lang="de">Drucken</value>
-        <value xml:lang="en">Print</value>
+        <value xml:lang="de">Drucken (PDF)</value>
+        <value xml:lang="en">Print (PDF)</value>
         <value xml:lang="es">Imprimir</value>
         <value xml:lang="fr">Imprimer</value>
         <value xml:lang="hi-IN">प्रिंट</value>
         <value xml:lang="it">Stampa</value>
         <value xml:lang="ja">印刷</value>
+        <value xml:lang="nl">Afdrukken (PDF)</value>
         <value xml:lang="pt">Imprimir</value>
         <value xml:lang="ro">Tipareste</value>
         <value xml:lang="ru">Печать</value>
@@ -8571,6 +8626,42 @@
         <value xml:lang="zh">打印</value>
         <value xml:lang="zh-TW">列印</value>
     </property>
+    <property key="CommonPrice">
+        <value xml:lang="en">Price</value>
+        <value xml:lang="nl">Prijs</value>
+    </property>
+    <property key="CommonPrices">
+        <value xml:lang="en">Prices</value>
+        <value xml:lang="nl">Prijzen</value>
+    </property>
+    <property key="CommonAdjustment">
+        <value xml:lang="en">Adjustment</value>
+        <value xml:lang="nl">Aanpassing</value>
+    </property>
+    <property key="CommonAdjustments">
+        <value xml:lang="en">Adjustments</value>
+        <value xml:lang="nl">Aanpassingen</value>
+    </property>
+    <property key="CommonAttribute">
+        <value xml:lang="en">Attribute</value>
+        <value xml:lang="nl">Attribuut</value>
+    </property>
+    <property key="CommonAttributes">
+        <value xml:lang="en">Attributes</value>
+        <value xml:lang="nl">Attritbuten</value>
+    </property>
+    <property key="CommonWorkEffort">
+        <value xml:lang="en">Work Effort</value>
+        <value xml:lang="nl">Activiteit</value>
+    </property>
+    <property key="CommonWorkEfforts">
+        <value xml:lang="en">Work Effort</value>
+        <value xml:lang="nl">Activiteiten</value>
+    </property>
+    <property key="CommonProfit">
+        <value xml:lang="en">Profit</value>
+        <value xml:lang="nl">Winst</value>
+    </property>
     <property key="CommonPrinterFriendly">
         <value xml:lang="cs">Tisk</value>
         <value xml:lang="de">Druckansicht</value>
@@ -8616,7 +8707,7 @@
         <value xml:lang="hi-IN">प्रसंस्करण</value>
         <value xml:lang="it">In esecuzione</value>
         <value xml:lang="ja">処理中</value>
-        <value xml:lang="nl">aan het Uitvoeren</value>
+        <value xml:lang="nl">In uitvoering</value>
         <value xml:lang="pt">Em processamento</value>
         <value xml:lang="ro">In Executie</value>
         <value xml:lang="ru">В работе</value>
@@ -8626,6 +8717,10 @@
         <value xml:lang="zh-CN">处理中</value>
         <value xml:lang="zh-TW">處理中</value>
     </property>
+    <property key="CommonProduct">
+        <value xml:lang="en">Product</value>
+        <value xml:lang="nl">Product</value>
+    </property>
     <property key="CommonProfile">
         <value xml:lang="ar">خصائص</value>
         <value xml:lang="cs">Profil</value>
@@ -8892,6 +8987,10 @@
         <value xml:lang="zh-CN">快速添加到购物列表</value>
         <value xml:lang="zh-TW">快速增加到購物清單</value>
     </property>
+    <property key="CommonQuote">
+        <value xml:lang="en">Quote</value>
+        <value xml:lang="nl">Offerte</value>
+    </property>
     <property key="CommonRate">
         <value xml:lang="ar">النسبة</value>
         <value xml:lang="cs">Sazba</value>
@@ -8963,6 +9062,7 @@
         <value xml:lang="hi-IN">कारण</value>
         <value xml:lang="it">Motivazione</value>
         <value xml:lang="ja">理由</value>
+        <value xml:lang="nl">Reden</value>
         <value xml:lang="pt-BR">Razão</value>
         <value xml:lang="ru">Причина</value>
         <value xml:lang="vi">Lý do</value>
@@ -9129,6 +9229,10 @@
         <value xml:lang="zh-CN">拒绝</value>
         <value xml:lang="zh-TW">已拒絕</value>
     </property>
+    <property key="CommonRelation">
+        <value xml:lang="en">Relation</value>
+        <value xml:lang="nl">Relatie</value>
+    </property>
     <property key="CommonRelatedInformation">
         <value xml:lang="cs">Související informace</value>
         <value xml:lang="de">Ähnliche Informationen</value>
@@ -9151,6 +9255,7 @@
         <value xml:lang="es">Distribución</value>
         <value xml:lang="fr">Distribution</value>
         <value xml:lang="ja">リリース</value>
+        <value xml:lang="nl">Release</value>
         <value xml:lang="ru">Релиз</value>
         <value xml:lang="vi">Ban hành</value>
         <value xml:lang="zh">发布</value>
@@ -9163,6 +9268,7 @@
         <value xml:lang="es">Fecha distribución</value>
         <value xml:lang="fr">Date de distribution</value>
         <value xml:lang="ja">リリース日</value>
+        <value xml:lang="nl">Release-datum</value>
         <value xml:lang="pt-BR">Data de Lançamento</value>
         <value xml:lang="ru">Дата релиза</value>
         <value xml:lang="vi">Ngày ban hành</value>
@@ -9298,6 +9404,10 @@
         <value xml:lang="zh">重新查询</value>
         <value xml:lang="zh-TW">再查詢</value>
     </property>
+    <property key="CommonRequest">
+        <value xml:lang="en">Request</value>
+        <value xml:lang="nl">Verzoek</value>
+    </property>
     <property key="CommonRequired">
         <value xml:lang="ar">إلزامي</value>
         <value xml:lang="cs">Požadováno</value>
@@ -9459,6 +9569,14 @@
         <value xml:lang="zh-CN">评论</value>
         <value xml:lang="zh-TW">評論</value>
     </property>
+    <property key="CommonRole">
+        <value xml:lang="en">Role</value>
+        <value xml:lang="nl">Rol</value>
+    </property>
+    <property key="CommonRoles">
+        <value xml:lang="en">Roles</value>
+        <value xml:lang="nl">Rollen</value>
+    </property>
     <property key="CommonRouting">
         <value xml:lang="ar">تمرير</value>
         <value xml:lang="cs">Směrování</value>
@@ -10080,6 +10198,10 @@
         <value xml:lang="zh-CN">序列编号</value>
         <value xml:lang="zh-TW">序號數</value>
     </property>
+    <property key="CommonSeqId">
+        <value xml:lang="en">Sequence Id</value>
+        <value xml:lang="nl">Volg ID</value>
+    </property>
     <property key="CommonServerHour">
         <value xml:lang="en">Server Hour</value>
         <value xml:lang="fr">Heure du serveur </value>
@@ -10183,6 +10305,10 @@
         <value xml:lang="zh-CN">(如果为空就按当前日期赋值)</value>
         <value xml:lang="zh-TW">(如果是空值,將設定為目前時間)</value>
     </property>
+    <property key="CommonShipment">
+        <value xml:lang="en">Shipment</value>
+        <value xml:lang="nl">Zending</value>
+    </property>
     <property key="CommonShipping">
         <value xml:lang="cs">Doprava</value>
         <value xml:lang="de">Versand</value>
@@ -10739,6 +10865,7 @@
         <value xml:lang="hi-IN">सारांश</value>
         <value xml:lang="it">Sommario</value>
         <value xml:lang="ja">合計</value>
+        <value xml:lang="nl">Samenvatting</value>
         <value xml:lang="pt-BR">Resumo</value>
         <value xml:lang="ru">Резюме</value>
         <value xml:lang="vi">Tóm lược</value>
@@ -10910,6 +11037,16 @@
         <value xml:lang="zh">承租人代號</value>
         <value xml:lang="zh-TW">承租人識別</value>
     </property>
+    <property key="CommonTerm">
+        <value xml:lang="en">Term</value>
+        <value xml:lang="nl">Conditie</value>
+    </property>
+    
+    <property key="CommonTerms">
+        <value xml:lang="en">Terms</value>
+        <value xml:lang="nl">Condities</value>
+    </property>
+    
     <property key="CommonTest">
         <value xml:lang="ar">إختبار</value>
         <value xml:lang="cs">Test</value>
@@ -11048,7 +11185,7 @@
         <value xml:lang="hi-IN">तक</value>
         <value xml:lang="it">Fino a </value>
         <value xml:lang="ja">終了</value>
-        <value xml:lang="nl">tot</value>
+        <value xml:lang="nl">Tot</value>
         <value xml:lang="pt">Até</value>
         <value xml:lang="ro">Pina la </value>
         <value xml:lang="ru">До</value>
@@ -12070,7 +12207,7 @@
         <value xml:lang="ru">Доступ к этому виду - запрещен</value>
         <value xml:lang="vi">Quyền truy cập tới giao diện này hiện đã bị khoá</value>
         <value xml:lang="zh">已经禁止访问这个界面了。</value>
-        <value xml:lang="zh_-TW">已經禁止訪問這個檢視了.</value>
+        <value xml:lang="zh-TW">已經禁止訪問這個檢視了.</value>
     </property>
     <property key="CommonViewCalendar">
         <value xml:lang="ar">مشاهدة الرزمانة</value>
@@ -13070,7 +13207,7 @@
         <value xml:lang="hi-IN">द्वारा बनाया गया</value>
         <value xml:lang="it">Creato da</value>
         <value xml:lang="ja">作成者</value>
-        <value xml:lang="nl">Aangemaakt door By</value>
+        <value xml:lang="nl">Door gebruiker</value>
         <value xml:lang="pt-BR">Criado por</value>
         <value xml:lang="ro">Creat De</value>
         <value xml:lang="ru">Создан</value>
@@ -13083,13 +13220,13 @@
         <value xml:lang="ar">استحدث من طرف المستخدم</value>
         <value xml:lang="cs">Vytvořeno uživatelem s loginem</value>
         <value xml:lang="de">Erstellt von Benutzer</value>
-        <value xml:lang="en">Created By User Login</value>
+        <value xml:lang="en">Created By User</value>
         <value xml:lang="es">Creado por usuario</value>
         <value xml:lang="fr">Créé par l'identifiant de connexion</value>
         <value xml:lang="hi-IN">उपयोगकर्ता लॉगिन द्वारा निर्मित</value>
         <value xml:lang="it">Creato dall'utente</value>
         <value xml:lang="ja">作成ユーザ</value>
-        <value xml:lang="nl">Aangemaakt door ingelogde gebruiker</value>
+        <value xml:lang="nl">Door gebruiker</value>
         <value xml:lang="pt-BR">Criado através de um login de usuário</value>
         <value xml:lang="ro">Creiat De Utilizator</value>
         <value xml:lang="ru">Создано (имя входа)</value>
@@ -13403,13 +13540,13 @@
         <value xml:lang="ar">آخر تغيير من طرف المستخدم</value>
         <value xml:lang="cs">Naposledy změněno uživatelem s loginem</value>
         <value xml:lang="de">Zuletzt geändert von Benutzer</value>
-        <value xml:lang="en">Last Modified By User Login</value>
+        <value xml:lang="en">Last Modified By User</value>
         <value xml:lang="es">Última modificación por usuario</value>
         <value xml:lang="fr">Modification en dernier par l'identifiant de connexion</value>
         <value xml:lang="hi-IN">उपयोगकर्ता लॉगिन द्वारा अंतिम बार संशोधित</value>
         <value xml:lang="it">Ultima modifica dell'utente</value>
         <value xml:lang="ja">最終更新ユーザ</value>
-        <value xml:lang="nl">Laatste wijziging door gebruiker</value>
+        <value xml:lang="nl">Door gebruiker</value>
         <value xml:lang="pt-BR">Última modificação pelo login de Usuário</value>
         <value xml:lang="ro">Ultima Modificare Utilizator</value>
         <value xml:lang="ru">Последнее изменение пользователем</value>
@@ -13428,7 +13565,7 @@
         <value xml:lang="hi-IN">अंतिम बार संशोधित दिनांक</value>
         <value xml:lang="it">Data ultima modifica</value>
         <value xml:lang="ja">最終更新日</value>
-        <value xml:lang="nl">Laatste wijziging op</value>
+        <value xml:lang="nl">Laatste wijziging</value>
         <value xml:lang="pt-BR">Data da última modificação</value>
         <value xml:lang="ro">Data Ultimei Modificari</value>
         <value xml:lang="ru">Дата последнего изменения</value>
@@ -13495,6 +13632,7 @@
         <value xml:lang="hi-IN">उपयोगकर्ता लॉगिन क्रमांक द्वारा संशोधित</value>
         <value xml:lang="it">Modificato dall'utente</value>
         <value xml:lang="ja">更新ユーザID</value>
+        <value xml:lang="nl">Aangepast door</value>
         <value xml:lang="pt-BR">Modificado por Login de usuário Id</value>
         <value xml:lang="ru">Модифицированно пользователем ID</value>
         <value xml:lang="vi">Chỉnh sửa bởi người dùng đăng nhập</value>
@@ -13716,6 +13854,7 @@
         <value xml:lang="hi-IN">क्रम संख्या</value>
         <value xml:lang="it">Numero sequenza</value>
         <value xml:lang="ja">連番</value>
+        <value xml:lang="nl">Volgno.</value>
         <value xml:lang="pt">Número de Sequência</value>
         <value xml:lang="pt-BR">Nº de Seqüência</value>
         <value xml:lang="ro">Num. Secventa</value>
@@ -13847,7 +13986,7 @@
         <value xml:lang="hi-IN">माप की इकाई</value>
         <value xml:lang="it">Udm</value>
         <value xml:lang="ja">単位</value>
-        <value xml:lang="nl">Valuta</value>
+        <value xml:lang="nl">UoM</value>
         <value xml:lang="pt">UOM</value>
         <value xml:lang="pt-BR">UDM</value>
         <value xml:lang="ro">Udm</value>
@@ -14032,7 +14171,7 @@
         <value xml:lang="hi-IN">आदेश</value>
         <value xml:lang="it">Ordini</value>
         <value xml:lang="ja">注文</value>
-        <value xml:lang="nl">Bestelling</value>
+        <value xml:lang="nl">Order</value>
         <value xml:lang="pt">Encomenda</value>
         <value xml:lang="pt-BR">Pedido</value>
         <value xml:lang="ro">Comenzi</value>
@@ -14826,4 +14965,6 @@
         <value xml:lang="zh-CN">中文</value>
         <value xml:lang="zh-TW">中文</value>
     </property>
+    
+    
 </resource>
diff --git a/framework/webtools/config/WebtoolsUiLabels.xml b/framework/webtools/config/WebtoolsUiLabels.xml
index 73cc6be..a8f82f5 100644
--- a/framework/webtools/config/WebtoolsUiLabels.xml
+++ b/framework/webtools/config/WebtoolsUiLabels.xml
@@ -565,16 +565,6 @@
         <value xml:lang="zh">查找任务</value>
         <value xml:lang="zh-TW">尋找任務</value>
     </property>
-    <property key="PageTitleFindPortalPage">
-        <value xml:lang="en">Find Portal page</value>
-        <value xml:lang="fr">Rech. page portail</value>
-        <value xml:lang="it">Ricerca pagine portale</value>
-        <value xml:lang="ja">ポータルページを検索</value>
-        <value xml:lang="pt">Encontrar a página do Portal</value>
-        <value xml:lang="vi">Tìm trang Cổng thông tin</value>
-        <value xml:lang="zh">查找门户页面</value>
-        <value xml:lang="zh-TW">查詢入口網頁</value>
-    </property>
     <property key="PageTitleFindUtilCache">
         <value xml:lang="de">Cache Wartungsseite</value>
         <value xml:lang="en">Cache Maintenance Page</value>
@@ -801,14 +791,6 @@
         <value xml:lang="zh">调整调试级别</value>
         <value xml:lang="zh-TW">調整偵錯級別</value>
     </property>
-    <property key="WebtoolsAdminPortalPage">
-        <value xml:lang="en">Portal page Admin.</value>
-        <value xml:lang="fr">Admin. Page portail</value>
-        <value xml:lang="ja">ポータルページの管理</value>
-        <value xml:lang="vi">Quản trị Cổng thông tin</value>
-        <value xml:lang="zh">门户页面管理</value>
-        <value xml:lang="zh-TW">入口網頁面管理</value>
-    </property>
     <property key="WebtoolsAdministration">
         <value xml:lang="de">Administration</value>
         <value xml:lang="en">Administration</value>
diff --git a/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml b/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml
index f4a823f..cd7f9aa 100644
--- a/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml
+++ b/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml
@@ -44,8 +44,5 @@
       <listitem>
         <para>The <link xl:href="">Configuration</link> section is used to set parameters for the OFBiz system.</para>
       </listitem>
-      <listitem>
-        <para>The <link xl:href="">Portal Page Admin.</link> section is used to browse and edit all Portal Pages defined in the system.</para>
-      </listitem>
     </itemizedlist>
 </section>
diff --git a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
index 46f0f93..d601bfb 100644
--- a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
+++ b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
@@ -33,7 +33,7 @@
 import org.ofbiz.base.util.UtilURL;
 import org.ofbiz.widget.artifact.ArtifactInfoContext;
 import org.ofbiz.widget.artifact.ArtifactInfoGatherer;
-import org.ofbiz.widget.model.ModelForm;
+import org.ofbiz.widget.model.*;
 import org.xml.sax.SAXException;
 
 /**
@@ -73,7 +73,11 @@
         ArtifactInfoContext infoContext = new ArtifactInfoContext();
         ArtifactInfoGatherer infoGatherer = new ArtifactInfoGatherer(infoContext);
         try {
-            infoGatherer.visit(this.modelForm);
+            if (this.modelForm instanceof ModelSingleForm) {
+                infoGatherer.visit((ModelSingleForm) this.modelForm);
+            } else {
+                infoGatherer.visit((ModelGrid) this.modelForm);
+            }
         } catch (Exception e) {
             throw new GeneralException(e);
         }
diff --git a/framework/webtools/webapp/webtools/WEB-INF/controller.xml b/framework/webtools/webapp/webtools/WEB-INF/controller.xml
index cf0b672..e248e36 100644
--- a/framework/webtools/webapp/webtools/WEB-INF/controller.xml
+++ b/framework/webtools/webapp/webtools/WEB-INF/controller.xml
@@ -541,37 +541,6 @@
         <response name="success" type="view" value="findTemporalExpression"/>
     </request-map>
 
-    <!-- PortalPage administration  -->
-    <request-map uri="FindPortalPage">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindPortalPage"/>
-    </request-map>
-    <request-map uri="EditPortalPage">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditPortalPage"/>
-    </request-map>
-    <request-map uri="DuplicatePortalPage">
-        <security https="true" auth="true"/>
-        <event  type="simple" invoke="duplicatePortalPage" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
-        <response name="success" type="view" value="EditPortalPage"/>
-    </request-map>
-    <request-map uri="NewPortalPage">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="CreatePortalPage"/>
-    </request-map>
-    <request-map uri="createPortalPageAdm">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createPortalPage"/>
-        <response name="success" type="view" value="EditPortalPage"/>
-        <response name="error" type="view" value="CreatePortalPage"/>
-    </request-map>
-    <request-map uri="updatePortalPageAdm">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updatePortalPage"/>
-        <response name="success" type="view" value="EditPortalPage"/>
-        <response name="error" type="view" value="EditPortalPage"/>
-    </request-map>
-
     <!-- Geo Management -->
     <request-map uri="FindGeo"><security https="true" auth="true"/><response name="success" type="view" value="FindGeo" save-home-view="true"/></request-map>
     <request-map uri="EditGeo"><security https="true" auth="true"/><response name="success" type="view" value="EditGeo"/></request-map>
@@ -701,11 +670,6 @@
     <view-map name="editTemporalExpression" type="screen" page="component://webtools/widget/TempExprScreens.xml#EditTemporalExpression"/>
     <view-map name="findTemporalExpression" type="screen" page="component://webtools/widget/TempExprScreens.xml#FindTemporalExpression"/>
 
-    <!-- PortalPage administration  -->
-    <view-map name="FindPortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#FindPortalPage"/>
-    <view-map name="CreatePortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#CreatePortalPage"/>
-    <view-map name="EditPortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#EditPortalPage"/>
-
     <!-- Geo Management -->
     <view-map name="FindGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#FindGeo"/>
     <view-map name="EditGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#EditGeo"/>
diff --git a/framework/webtools/webapp/webtools/main.ftl b/framework/webtools/webapp/webtools/main.ftl
index b4d72f5..c526a0c 100644
--- a/framework/webtools/webapp/webtools/main.ftl
+++ b/framework/webtools/webapp/webtools/main.ftl
@@ -96,7 +96,6 @@
         </#if>
         <li><h3>${uiLabelMap.WebtoolsMiscSetupTools}</h3></li>
         <#if security.hasPermission("PORTALPAGE_ADMIN", session)>
-          <li><a href="<@ofbizUrl>FindPortalPage</@ofbizUrl>">${uiLabelMap.WebtoolsAdminPortalPage}</a></li>
           <li><a href="<@ofbizUrl>FindGeo</@ofbizUrl>">${uiLabelMap.WebtoolsGeoManagement}</a></li>
           <li><a href="<@ofbizUrl>WebtoolsLayoutDemo</@ofbizUrl>">${uiLabelMap.WebtoolsLayoutDemo}</a></li>
         </#if>
diff --git a/framework/webtools/widget/Menus.xml b/framework/webtools/widget/Menus.xml
index fe05f42..bd4abc7 100644
--- a/framework/webtools/widget/Menus.xml
+++ b/framework/webtools/widget/Menus.xml
@@ -47,10 +47,6 @@
         </menu-item>
         <menu-item name="geoManagement" title="${uiLabelMap.WebtoolsGeoManagement}">
             <link target="FindGeo"/>
-        </menu-item>        
-        <menu-item name="portalAdmin" title="${uiLabelMap.WebtoolsAdminPortalPage}">
-            <condition><if-has-permission permission="PORTALPAGE_ADMIN"/></condition>
-            <link target="FindPortalPage"/>
         </menu-item>
         <menu-item name="security" title="${uiLabelMap.CommonSecurity}">
             <condition>
@@ -203,22 +199,6 @@
         </menu-item>
     </menu>
 
-    <menu name="PortalPageAdmin">
-        <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}">
-            <link target="DuplicatePortalPage">
-               <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
-            </link>
-        </menu-item>
-        <menu-item name="new" title="${uiLabelMap.CommonNew}">
-            <link target="NewPortalPage"/>
-        </menu-item>
-        <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}">
-            <link target="EditPortalPage">
-               <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
-            </link>
-        </menu-item>
-    </menu>
-
     <menu name="StatsTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
           selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="stats" title="${uiLabelMap.WebtoolsStatistics}">
diff --git a/framework/widget/dtd/widget-form.xsd b/framework/widget/dtd/widget-form.xsd
index 671f352..6060638 100644
--- a/framework/widget/dtd/widget-form.xsd
+++ b/framework/widget/dtd/widget-form.xsd
@@ -23,9 +23,10 @@
   <!-- ================== FORMS ==================== -->
     <xs:element name="forms">
         <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="form"/>
-            </xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element ref="form"/>
+                <xs:element ref="grid"/>
+            </xs:choice>
         </xs:complexType>
     </xs:element>
     <xs:element name="form">
@@ -288,6 +289,266 @@
             -->
         </xs:complexType>
     </xs:element>
+    <xs:element name="grid">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" ref="actions" />
+                <xs:element minOccurs="0" ref="row-actions" />
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="alt-row-style" />
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="alt-target" />
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="auto-fields-service" />
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="auto-fields-entity" />
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="field" />
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="on-event-update-area" />
+                <xs:element minOccurs="0" ref="sort-order" />
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string" use="required" />
+            <xs:attribute name="type">
+                <xs:annotation>
+                    <xs:documentation>The form type is always required unless you are extending another form.</xs:documentation>
+                </xs:annotation>
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="single">
+                            <xs:annotation>
+                                <xs:documentation>a single form is a simple single form with values from a single set of values</xs:documentation>
+                            </xs:annotation>
+                        </xs:enumeration>
+                        <xs:enumeration value="list">
+                            <xs:annotation>
+                                <xs:documentation>a list form is a list of individual forms in a table (could be called a tabular form), it has a list of sets of values and creates one form for each list element</xs:documentation>
+                            </xs:annotation>
+                        </xs:enumeration>
+                        <xs:enumeration value="multi">
+                            <xs:annotation>
+                                <xs:documentation>a multi form is like a list/tabular form, but it creates a single form to submit all list item forms at once; the field names in the resulting form have an appendage attached to make them unique according to the pattern used for the multi-service
+                                    event handler that will call one service for each list element</xs:documentation>
+                            </xs:annotation>
+                        </xs:enumeration>
+                        <xs:enumeration value="upload">
+                        </xs:enumeration>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="target" type="xs:string" />
+            <xs:attribute name="target-window" type="xs:string" />
+            <xs:attribute name="target-type" default="intra-app">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="intra-app" />
+                        <xs:enumeration value="inter-app" />
+                        <xs:enumeration value="content" />
+                        <xs:enumeration value="plain" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="id" type="xs:string" />
+            <xs:attribute name="style" type="xs:string" />
+            <xs:attribute name="focus-field-name" type="xs:string" />
+            <xs:attribute name="title" type="xs:string" />
+            <xs:attribute name="tooltip" type="xs:string" />
+            <xs:attribute name="list-name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>for list type and other multiple data/form types this is the name of the list in the context to iterate over</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="list-entry-name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>if specified each list entry will be put in the context with this name; otherwise the list entry must be a Map and the entries in the Map will be put into the context by name</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <!-- this is now deprecated, never made sense to separate anyway; use list-name instead <xs:attribute type="xs:string" name="list-iterator-name"/> -->
+            <xs:attribute type="xs:string" name="default-map-name" />
+            <xs:attribute type="xs:string" name="default-entity-name" />
+            <xs:attribute type="xs:string" name="default-service-name" />
+            <xs:attribute type="xs:string" name="form-title-area-style">
+                <xs:annotation>
+                    <xs:documentation>The form-title-area-style specifies the style to use in the header or title area for the form in a multi-form widget with all form fields rendered in one area.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="form-widget-area-style">
+                <xs:annotation>
+                    <xs:documentation>The form-widget-area-style specifies the style to use in the main or widget area for the form in a multi-form widget with all form fields rendered in one area.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="default-title-area-style" />
+            <xs:attribute type="xs:string" name="default-widget-area-style" />
+            <xs:attribute type="xs:string" name="default-title-style" />
+            <xs:attribute type="xs:string" name="default-widget-style" />
+            <xs:attribute type="xs:string" name="default-tooltip-style" />
+            <xs:attribute type="xs:string" name="default-required-field-style" />
+            <xs:attribute type="xs:string" name="sort-field-parameter-name">
+                <xs:annotation>
+                    <xs:documentation>
+                        The name of the request parameter that is used for specifying the sorted column. This is required when you
+                        have more than one list on a screen - each list must use its own sort field parameter. Defaults to "sortField".
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="default-sort-field-style">
+                <xs:annotation>
+                    <xs:documentation>CSS style to used for form sort fields. Defaults to "sort-order".</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="default-sort-field-asc-style">
+                <xs:annotation>
+                    <xs:documentation>CSS style to used for form sort fields. Defaults to "sort-order-asc".</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="default-sort-field-desc-style">
+                <xs:annotation>
+                    <xs:documentation>CSS style to used for form sort fields. Defaults to "sort-order-desc".</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="paginate" default="${paginate}">
+                <xs:annotation>
+                    <xs:documentation>Indicate if this form is paginated or not, true by default.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="paginate-target">
+                <xs:annotation>
+                    <xs:documentation>Target location for the [Previous] and [Next] buttons in a form with pagination. Accepts ${} notation.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="paginate-target-anchor">
+                <xs:annotation>
+                    <xs:documentation>Target anchor for the [Previous] and [Next] buttons in a form with pagination.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="paginate-size-field">
+                <xs:annotation>
+                    <xs:documentation>The name of the parameter that specifies the number of rows to display for each page in a list form with multiple pages. The default is VIEW_SIZE. Accepts ${} notation.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="paginate-index-field">
+                <xs:annotation>
+                    <xs:documentation>The name of the parameter that specifies what the current page is in a list form with multiple pages. The default is VIEW_INDEX Accepts ${} notation.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="override-list-size">
+                <xs:annotation>
+                    <xs:documentation>The total number of rows in the original list (used for pagination). If not specified, the size of the list will be used. Accepts ${} notation.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="paginate-first-label">
+                <xs:annotation>
+                    <xs:documentation>Text to display for the [First] button in a form with pagination. Defaults to the CommonFirst label defined in CommonUiLabels.xml. Accepts ${} notation.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="paginate-previous-label">
+                <xs:annotation>
+                    <xs:documentation>Text to display for the [Previous] button in a form with pagination. Defaults to the CommonPrevious label defined in CommonUiLabels.xml. Accepts ${} notation.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="paginate-next-label">
+                <xs:annotation>
+                    <xs:documentation>Text to display for the [Next] button in a form with pagination. Defaults to the CommonNext label defined in CommonUiLabels.xml. Accepts ${} notation.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="paginate-last-label">
+                <xs:annotation>
+                    <xs:documentation>Text to display for the [Last] button in a form with pagination. Defaults to the CommonLast label defined in CommonUiLabels.xml. Accepts ${} notation.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="paginate-style">
+                <xs:annotation>
+                    <xs:documentation>CSS style to use for the whole pager in a form with pagination. Defaults to "nav-pager".</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="item-index-separator" default="_o_" />
+            <xs:attribute type="xs:string" name="extends" />
+            <xs:attribute type="xs:string" name="extends-resource" />
+            <xs:attribute name="separate-columns" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="group-columns" default="true">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute type="xs:integer" name="view-size">
+                <xs:annotation>
+                    <xs:documentation>The number of items to display per page</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="row-count" />
+            <xs:attribute name="use-row-submit" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="skip-start" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="skip-end" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="hide-header" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="odd-row-style">
+                <xs:annotation>
+                    <xs:documentation>The odd-row-style specifies the style to use in the table content odd rows.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="even-row-style">
+                <xs:annotation>
+                    <xs:documentation>The even-row-style specifies the style to use in the table content even rows.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="header-row-style">
+                <xs:annotation>
+                    <xs:documentation>The header-row-style specifies the style to use in the header of table.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="default-table-style">
+                <xs:annotation>
+                    <xs:documentation>The default-table-style specifies the style to use in the table.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="client-autocomplete-fields" default="true">
+                <xs:annotation>
+                    <xs:documentation>Tells the browser whether or not to try and autocomplete with values previously entered. Default to true.</xs:documentation>
+                </xs:annotation>
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <!--
+                not sure this is such a good idea <xs:attribute type="xs:string" name="hidden-values-map-name"> <xs:annotation> <xs:documentation>A map that contains hidden field name/value pairs. The reason for this is to eliminate the need to code custom forms so that auxiliary, passthru data can
+                be sent to the server. By doing it this way, more standard forms can be used. </xs:documentation> </xs:annotation> </xs:attribute>
+            -->
+        </xs:complexType>
+    </xs:element>
     <xs:element name="alt-target">
         <xs:complexType>
             <xs:attribute name="use-when" type="xs:string" use="required" />
@@ -1018,6 +1279,19 @@
                         <xs:documentation>Deprecated - use the image element.</xs:documentation>
                     </xs:annotation>
                 </xs:attribute>
+                <xs:attribute name="target-type" default="intra-app">
+                    <xs:annotation>
+                        <xs:documentation>Deprecated - use the url-mode attribute.</xs:documentation>
+                    </xs:annotation>
+                    <xs:simpleType>
+                        <xs:restriction base="xs:token">
+                            <xs:enumeration value="intra-app" />
+                            <xs:enumeration value="inter-app" />
+                            <xs:enumeration value="content" />
+                            <xs:enumeration value="plain" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
@@ -1671,7 +1945,25 @@
                         <xs:documentation>Specifies the string to display, can use the ${} syntax to insert context values; if empty the value of the field will be printed for a default.</xs:documentation>
                     </xs:annotation>
                 </xs:attribute>
-            <xs:attribute type="xs:string" name="use-when" />
+                <xs:attribute type="xs:string" name="use-when" />
+                <xs:attribute name="target-type" default="intra-app">
+                    <xs:annotation>
+                        <xs:documentation>Deprecated - use the url-mode attribute.</xs:documentation>
+                    </xs:annotation>
+                    <xs:simpleType>
+                        <xs:restriction base="xs:token">
+                            <xs:enumeration value="intra-app" />
+                            <xs:enumeration value="inter-app" />
+                            <xs:enumeration value="content" />
+                            <xs:enumeration value="plain" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="link-style" type="xs:string">
+                    <xs:annotation>
+                        <xs:documentation>Deprecated - use the style attribute.</xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
diff --git a/framework/widget/dtd/widget-screen.xsd b/framework/widget/dtd/widget-screen.xsd
index 9821852..cfe3ce7 100644
--- a/framework/widget/dtd/widget-screen.xsd
+++ b/framework/widget/dtd/widget-screen.xsd
@@ -450,6 +450,20 @@
             </xs:attribute>
         </xs:complexType>
     </xs:element>
+    <xs:element name="include-grid" substitutionGroup="AllWidgets">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="name" use="required" />
+            <xs:attribute type="xs:string" name="location" use="required" />
+            <xs:attribute name="share-scope" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="include-menu" substitutionGroup="AllWidgets">
         <xs:complexType>
             <xs:attribute type="xs:string" name="name" use="required" />
diff --git a/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java b/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java
index a8fb7ee..82c6faa 100644
--- a/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java
+++ b/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java
@@ -33,22 +33,14 @@
 import org.ofbiz.widget.model.AbstractModelAction.Script;

 import org.ofbiz.widget.model.AbstractModelAction.Service;

 import org.ofbiz.widget.model.AbstractModelAction.SetField;

-import org.ofbiz.widget.model.FieldInfo;

-import org.ofbiz.widget.model.HtmlWidget;

+import org.ofbiz.widget.model.*;

 import org.ofbiz.widget.model.HtmlWidget.HtmlTemplate;

 import org.ofbiz.widget.model.HtmlWidget.HtmlTemplateDecorator;

 import org.ofbiz.widget.model.HtmlWidget.HtmlTemplateDecoratorSection;

-import org.ofbiz.widget.model.IterateSectionWidget;

-import org.ofbiz.widget.model.ModelAction;

-import org.ofbiz.widget.model.ModelActionVisitor;

-import org.ofbiz.widget.model.ModelFieldVisitor;

-import org.ofbiz.widget.model.ModelForm;

 import org.ofbiz.widget.model.ModelForm.AltTarget;

 import org.ofbiz.widget.model.ModelForm.AutoFieldsEntity;

 import org.ofbiz.widget.model.ModelForm.AutoFieldsService;

-import org.ofbiz.widget.model.ModelFormAction;

 import org.ofbiz.widget.model.ModelFormAction.CallParentActions;

-import org.ofbiz.widget.model.ModelFormField;

 import org.ofbiz.widget.model.ModelFormField.CheckField;

 import org.ofbiz.widget.model.ModelFormField.ContainerField;

 import org.ofbiz.widget.model.ModelFormField.DateFindField;

@@ -71,11 +63,6 @@
 import org.ofbiz.widget.model.ModelFormField.TextField;

 import org.ofbiz.widget.model.ModelFormField.TextFindField;

 import org.ofbiz.widget.model.ModelFormField.TextareaField;

-import org.ofbiz.widget.model.ModelMenu;

-import org.ofbiz.widget.model.ModelMenuAction;

-import org.ofbiz.widget.model.ModelMenuItem;

-import org.ofbiz.widget.model.ModelScreen;

-import org.ofbiz.widget.model.ModelScreenWidget;

 import org.ofbiz.widget.model.ModelScreenWidget.Column;

 import org.ofbiz.widget.model.ModelScreenWidget.ColumnContainer;

 import org.ofbiz.widget.model.ModelScreenWidget.Container;

@@ -84,6 +71,7 @@
 import org.ofbiz.widget.model.ModelScreenWidget.DecoratorSection;

 import org.ofbiz.widget.model.ModelScreenWidget.DecoratorSectionInclude;

 import org.ofbiz.widget.model.ModelScreenWidget.Form;

+import org.ofbiz.widget.model.ModelScreenWidget.Grid;

 import org.ofbiz.widget.model.ModelScreenWidget.HorizontalSeparator;

 import org.ofbiz.widget.model.ModelScreenWidget.IncludeScreen;

 import org.ofbiz.widget.model.ModelScreenWidget.Label;

@@ -95,11 +83,8 @@
 import org.ofbiz.widget.model.ModelScreenWidget.Screenlet;

 import org.ofbiz.widget.model.ModelScreenWidget.Section;

 import org.ofbiz.widget.model.ModelScreenWidget.Tree;

-import org.ofbiz.widget.model.ModelTree;

 import org.ofbiz.widget.model.ModelTree.ModelNode;

 import org.ofbiz.widget.model.ModelTree.ModelNode.ModelSubNode;

-import org.ofbiz.widget.model.ModelTreeAction;

-import org.ofbiz.widget.model.ModelWidgetVisitor;

 

 /**

  * An object that gathers artifact information from screen widgets.

@@ -184,6 +169,12 @@
     }

 

     @Override

+    public void visit(Grid grid) throws Exception {

+        String gridLocation = grid.getLocation().concat("#").concat(grid.getName());

+        infoContext.addFormLocation(gridLocation);

+    }

+

+    @Override

     public void visit(GetRelated getRelated) throws Exception {

         infoContext.addEntityName(getRelated.getRelationName());

     }

@@ -233,7 +224,7 @@
     }

 

     @Override

-    public void visit(ModelForm modelForm) throws Exception {

+    public void visit(ModelSingleForm modelForm) throws Exception {

         if (modelForm.getActions() != null) {

             for (ModelAction action : modelForm.getActions()) {

                 action.accept(this);

@@ -311,6 +302,12 @@
     }

 

     @Override

+    public void visit(ModelGrid modelGrid) throws Exception {

+        // TODO: Finish implementation

+        

+    }

+

+    @Override

     public void visit(ModelFormAction.Service service) throws Exception {

         infoContext.addServiceName(service.getServiceName());

         // TODO: Look for entityName in performFind service call

diff --git a/framework/widget/src/org/ofbiz/widget/model/FormFactory.java b/framework/widget/src/org/ofbiz/widget/model/FormFactory.java
index a9ba4ad..a656277 100644
--- a/framework/widget/src/org/ofbiz/widget/model/FormFactory.java
+++ b/framework/widget/src/org/ofbiz/widget/model/FormFactory.java
@@ -29,6 +29,7 @@
 import javax.xml.parsers.ParserConfigurationException;

 

 import org.ofbiz.base.location.FlexibleLocation;

+import org.ofbiz.base.util.Debug;

 import org.ofbiz.base.util.UtilHttp;

 import org.ofbiz.base.util.UtilXml;

 import org.ofbiz.base.util.cache.UtilCache;

@@ -40,7 +41,6 @@
 import org.w3c.dom.Element;

 import org.xml.sax.SAXException;

 

-

 /**

  * Widget Library - Form factory class

  */

@@ -90,7 +90,7 @@
             URL formFileUrl = servletContext.getResource(resourceName);

             Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true, true);

             Element formElement = UtilXml.firstChildElement(formFileDoc.getDocumentElement(), "form", "name", formName);

-            modelForm = new ModelForm(formElement, resourceName, delegator.getModelReader(), dispatcher.getDispatchContext());

+            modelForm = createModelForm(formElement, delegator.getModelReader(), dispatcher.getDispatchContext(), resourceName, formName);

             modelForm = formWebappCache.putIfAbsentAndGet(cacheKey, modelForm);

         }

         if (modelForm == null) {

@@ -125,7 +125,11 @@
     }

 

     public static ModelForm createModelForm(Element formElement, ModelReader entityModelReader, DispatchContext dispatchContext, String formLocation, String formName) {

-        ModelForm modelForm = new ModelForm(formElement, formLocation, entityModelReader, dispatchContext);

-        return modelForm;

+        String formType = formElement.getAttribute("type");

+        if (formType.isEmpty() || "single".equals(formType) || "upload".equals(formType)) {

+            return new ModelSingleForm(formElement, formLocation, entityModelReader, dispatchContext);

+        } else {

+            return new ModelGrid(formElement, formLocation, entityModelReader, dispatchContext);

+        }

     }

 }

diff --git a/framework/widget/src/org/ofbiz/widget/model/GridFactory.java b/framework/widget/src/org/ofbiz/widget/model/GridFactory.java
new file mode 100644
index 0000000..120c870
--- /dev/null
+++ b/framework/widget/src/org/ofbiz/widget/model/GridFactory.java
@@ -0,0 +1,134 @@
+/*******************************************************************************

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ * http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ *******************************************************************************/

+package org.ofbiz.widget.model;

+

+import java.io.IOException;

+import java.net.URL;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+

+import javax.servlet.ServletContext;

+import javax.servlet.http.HttpServletRequest;

+import javax.xml.parsers.ParserConfigurationException;

+

+import org.ofbiz.base.location.FlexibleLocation;

+import org.ofbiz.base.util.UtilHttp;

+import org.ofbiz.base.util.UtilXml;

+import org.ofbiz.base.util.cache.UtilCache;

+import org.ofbiz.entity.Delegator;

+import org.ofbiz.entity.model.ModelReader;

+import org.ofbiz.service.DispatchContext;

+import org.ofbiz.service.LocalDispatcher;

+import org.w3c.dom.Document;

+import org.w3c.dom.Element;

+import org.xml.sax.SAXException;

+

+

+/**

+ * Widget Library - Grid factory class

+ */

+public class GridFactory {

+

+    public static final String module = GridFactory.class.getName();

+    private static final UtilCache<String, ModelGrid> gridLocationCache = UtilCache.createUtilCache("widget.grid.locationResource", 0, 0, false);

+    private static final UtilCache<String, ModelGrid> gridWebappCache = UtilCache.createUtilCache("widget.grid.webappResource", 0, 0, false);

+

+    public static Map<String, ModelGrid> getGridsFromLocation(String resourceName, ModelReader entityModelReader, DispatchContext dispatchContext)

+            throws IOException, SAXException, ParserConfigurationException {

+        URL gridFileUrl = FlexibleLocation.resolveLocation(resourceName);

+        Document gridFileDoc = UtilXml.readXmlDocument(gridFileUrl, true, true);

+        return readGridDocument(gridFileDoc, entityModelReader, dispatchContext, resourceName);

+    }

+

+    public static ModelGrid getGridFromLocation(String resourceName, String gridName, ModelReader entityModelReader, DispatchContext dispatchContext)

+            throws IOException, SAXException, ParserConfigurationException {

+        StringBuilder sb = new StringBuilder(dispatchContext.getDelegator().getDelegatorName());

+        sb.append(":").append(resourceName).append("#").append(gridName);

+        String cacheKey = sb.toString();

+        ModelGrid modelGrid = gridLocationCache.get(cacheKey);

+        if (modelGrid == null) {

+            URL gridFileUrl = FlexibleLocation.resolveLocation(resourceName);

+            Document gridFileDoc = UtilXml.readXmlDocument(gridFileUrl, true, true);

+            if (gridFileDoc == null) {

+                throw new IllegalArgumentException("Could not find resource [" + resourceName + "]");

+            }

+            modelGrid = createModelGrid(gridFileDoc, entityModelReader, dispatchContext, resourceName, gridName);

+            modelGrid = gridLocationCache.putIfAbsentAndGet(cacheKey, modelGrid);

+        }

+        if (modelGrid == null) {

+            throw new IllegalArgumentException("Could not find grid with name [" + gridName + "] in class resource [" + resourceName + "]");

+        }

+        return modelGrid;

+    }

+

+    public static ModelGrid getGridFromWebappContext(String resourceName, String gridName, HttpServletRequest request)

+            throws IOException, SAXException, ParserConfigurationException {

+        String webappName = UtilHttp.getApplicationName(request);

+        String cacheKey = webappName + "::" + resourceName + "::" + gridName;

+        ModelGrid modelGrid = gridWebappCache.get(cacheKey);

+        if (modelGrid == null) {

+            ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");

+            Delegator delegator = (Delegator) request.getAttribute("delegator");

+            LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");

+            URL gridFileUrl = servletContext.getResource(resourceName);

+            Document gridFileDoc = UtilXml.readXmlDocument(gridFileUrl, true, true);

+            Element gridElement = UtilXml.firstChildElement(gridFileDoc.getDocumentElement(), "grid", "name", gridName);

+            modelGrid = createModelGrid(gridElement, delegator.getModelReader(), dispatcher.getDispatchContext(), resourceName, gridName);

+            modelGrid = gridWebappCache.putIfAbsentAndGet(cacheKey, modelGrid);

+        }

+        if (modelGrid == null) {

+            throw new IllegalArgumentException("Could not find grid with name [" + gridName + "] in webapp resource [" + resourceName + "] in the webapp [" + webappName + "]");

+        }

+        return modelGrid;

+    }

+

+    public static Map<String, ModelGrid> readGridDocument(Document gridFileDoc, ModelReader entityModelReader, DispatchContext dispatchContext, String gridLocation) {

+        Map<String, ModelGrid> modelGridMap = new HashMap<String, ModelGrid>();

+        if (gridFileDoc != null) {

+            // read document and construct ModelGrid for each grid element

+            Element rootElement = gridFileDoc.getDocumentElement();

+            List<? extends Element> gridElements = UtilXml.childElementList(rootElement, "grid");

+            for (Element gridElement : gridElements) {

+                String gridName = gridElement.getAttribute("name");

+                String cacheKey = gridLocation + "#" + gridName;

+                ModelGrid modelGrid = gridLocationCache.get(cacheKey);

+                if (modelGrid == null) {

+                    modelGrid = createModelGrid(gridElement, entityModelReader, dispatchContext, gridLocation, gridName);

+                    modelGrid = gridLocationCache.putIfAbsentAndGet(cacheKey, modelGrid);

+                }

+                modelGridMap.put(gridName, modelGrid);

+            }

+        }

+        return modelGridMap;

+    }

+

+    public static ModelGrid createModelGrid(Document gridFileDoc, ModelReader entityModelReader, DispatchContext dispatchContext, String gridLocation, String gridName) {

+        Element gridElement = UtilXml.firstChildElement(gridFileDoc.getDocumentElement(), "grid", "name", gridName);

+        if (gridElement == null) {

+            // Backwards compatibility - look for form definition

+            gridElement = UtilXml.firstChildElement(gridFileDoc.getDocumentElement(), "form", "name", gridName);

+        }

+        return createModelGrid(gridElement, entityModelReader, dispatchContext, gridLocation, gridName);

+    }

+

+    public static ModelGrid createModelGrid(Element gridElement, ModelReader entityModelReader, DispatchContext dispatchContext, String gridLocation, String gridName) {

+        return new ModelGrid(gridElement, gridLocation, entityModelReader, dispatchContext);

+    }

+}

diff --git a/framework/widget/src/org/ofbiz/widget/model/ModelForm.java b/framework/widget/src/org/ofbiz/widget/model/ModelForm.java
index 73b87bb..b2e0d20 100644
--- a/framework/widget/src/org/ofbiz/widget/model/ModelForm.java
+++ b/framework/widget/src/org/ofbiz/widget/model/ModelForm.java
@@ -62,7 +62,7 @@
  * @see <code>widget-form.xsd</code>

  */

 @SuppressWarnings("serial")

-public class ModelForm extends ModelWidget {

+public abstract class ModelForm extends ModelWidget {

 

     /*

      * ----------------------------------------------------------------------- *

@@ -98,41 +98,41 @@
     public static String DEFAULT_SORT_FIELD_STYLE = "sort-order";

     public static String DEFAULT_SORT_FIELD_ASC_STYLE = "sort-order-asc";

     public static String DEFAULT_SORT_FIELD_DESC_STYLE = "sort-order-desc";

-    private final List<ModelAction> actions;

-    private final List<AltRowStyle> altRowStyles;

-    private final List<AltTarget> altTargets;

-    private final List<AutoFieldsEntity> autoFieldsEntities;

-    private final List<AutoFieldsService> autoFieldsServices;

-    private final boolean clientAutocompleteFields;

-    private final String containerId;

-    private final String containerStyle;

-    private final String defaultEntityName;

+    protected final List<ModelAction> actions;

+    protected final List<AltRowStyle> altRowStyles;

+    protected final List<AltTarget> altTargets;

+    protected final List<AutoFieldsEntity> autoFieldsEntities;

+    protected final List<AutoFieldsService> autoFieldsServices;

+    protected final boolean clientAutocompleteFields;

+    protected final String containerId;

+    protected final String containerStyle;

+    protected final String defaultEntityName;

     /** This field group will be the "catch-all" group for fields that are not

      *  included in an explicit field-group.

      */

-    private final FieldGroup defaultFieldGroup;

-    private final FlexibleMapAccessor<Map<String, ? extends Object>> defaultMapName;

-    private final String defaultRequiredFieldStyle;

-    private final String defaultServiceName;

-    private final String defaultSortFieldAscStyle;

-    private final String defaultSortFieldDescStyle;

-    private final String defaultSortFieldStyle;

-    private final String defaultTableStyle;

-    private final String defaultTitleAreaStyle;

-    private final String defaultTitleStyle;

-    private final String defaultTooltipStyle;

-    private final int defaultViewSize;

-    private final String defaultWidgetAreaStyle;

-    private final String defaultWidgetStyle;

-    private final String evenRowStyle;

+    protected final FieldGroup defaultFieldGroup;

+    protected final FlexibleMapAccessor<Map<String, ? extends Object>> defaultMapName;

+    protected final String defaultRequiredFieldStyle;

+    protected final String defaultServiceName;

+    protected final String defaultSortFieldAscStyle;

+    protected final String defaultSortFieldDescStyle;

+    protected final String defaultSortFieldStyle;

+    protected final String defaultTableStyle;

+    protected final String defaultTitleAreaStyle;

+    protected final String defaultTitleStyle;

+    protected final String defaultTooltipStyle;

+    protected final int defaultViewSize;

+    protected final String defaultWidgetAreaStyle;

+    protected final String defaultWidgetStyle;

+    protected final String evenRowStyle;

     /** This is a list of FieldGroups in the order they were created.

      * Can also include Banner objects.

      */

-    private final List<FieldGroupBase> fieldGroupList;

+    protected final List<FieldGroupBase> fieldGroupList;

     /** This Map is keyed with the field name and has a FieldGroup for the value.

      * Can also include Banner objects.

      */

-    private final Map<String, FieldGroupBase> fieldGroupMap;

+    protected final Map<String, FieldGroupBase> fieldGroupMap;

     /** This List will contain one copy of each field for each field name in the order

      * they were encountered in the service, entity, or form definition; field definitions

      * with constraints will also be in this list but may appear multiple times for the same

@@ -142,67 +142,67 @@
      * necessary to use the Map. The Map is used when loading the form definition to keep the

      * list clean and implement the override features for field definitions.

      */

-    private final List<ModelFormField> fieldList;

-    private final String focusFieldName;

-    private final String formLocation;

-    private final String formTitleAreaStyle;

-    private final String formWidgetAreaStyle;

-    private final boolean groupColumns;

-    private final String headerRowStyle;

-    private final boolean hideHeader;

-    private final String itemIndexSeparator;

-    private final List<String> lastOrderFields;

-    private final String listEntryName;

-    private final String listName;

-    private final List<ModelFormField> multiSubmitFields;

-    private final String oddRowStyle;

+    protected final List<ModelFormField> fieldList;

+    protected final String focusFieldName;

+    protected final String formLocation;

+    protected final String formTitleAreaStyle;

+    protected final String formWidgetAreaStyle;

+    protected final boolean groupColumns;

+    protected final String headerRowStyle;

+    protected final boolean hideHeader;

+    protected final String itemIndexSeparator;

+    protected final List<String> lastOrderFields;

+    protected final String listEntryName;

+    protected final String listName;

+    protected final List<ModelFormField> multiSubmitFields;

+    protected final String oddRowStyle;

     /** On Paginate areas to be updated. */

-    private final List<UpdateArea> onPaginateUpdateAreas;

+    protected final List<UpdateArea> onPaginateUpdateAreas;

     /** On Sort Column areas to be updated. */

-    private final List<UpdateArea> onSortColumnUpdateAreas;

+    protected final List<UpdateArea> onSortColumnUpdateAreas;

     /** On Submit areas to be updated. */

-    private final List<UpdateArea> onSubmitUpdateAreas;

-    private final FlexibleStringExpander overrideListSize;

-    private final FlexibleStringExpander paginate;

-    private final FlexibleStringExpander paginateFirstLabel;

-    private final FlexibleStringExpander paginateIndexField;

-    private final FlexibleStringExpander paginateLastLabel;

-    private final FlexibleStringExpander paginateNextLabel;

-    private final FlexibleStringExpander paginatePreviousLabel;

-    private final FlexibleStringExpander paginateSizeField;

-    private final String paginateStyle;

-    private final FlexibleStringExpander paginateTarget;

-    private final String paginateTargetAnchor;

-    private final FlexibleStringExpander paginateViewSizeLabel;

-    private final ModelForm parentModelForm;

-    private final List<ModelAction> rowActions;

-    private final FlexibleStringExpander rowCountExdr;

-    private final boolean separateColumns;

-    private final boolean skipEnd;

-    private final boolean skipStart;

-    private final String sortFieldParameterName;

-    private final List<SortField> sortOrderFields;

-    private final FlexibleStringExpander target;

-    private final String targetType;

-    private final FlexibleStringExpander targetWindowExdr;

-    private final String title;

-    private final String tooltip;

-    private final String type;

-    private final boolean useRowSubmit;

+    protected final List<UpdateArea> onSubmitUpdateAreas;

+    protected final FlexibleStringExpander overrideListSize;

+    protected final FlexibleStringExpander paginate;

+    protected final FlexibleStringExpander paginateFirstLabel;

+    protected final FlexibleStringExpander paginateIndexField;

+    protected final FlexibleStringExpander paginateLastLabel;

+    protected final FlexibleStringExpander paginateNextLabel;

+    protected final FlexibleStringExpander paginatePreviousLabel;

+    protected final FlexibleStringExpander paginateSizeField;

+    protected final String paginateStyle;

+    protected final FlexibleStringExpander paginateTarget;

+    protected final String paginateTargetAnchor;

+    protected final FlexibleStringExpander paginateViewSizeLabel;

+    protected final ModelForm parentModel;

+    protected final List<ModelAction> rowActions;

+    protected final FlexibleStringExpander rowCountExdr;

+    protected final boolean separateColumns;

+    protected final boolean skipEnd;

+    protected final boolean skipStart;

+    protected final String sortFieldParameterName;

+    protected final List<SortField> sortOrderFields;

+    protected final FlexibleStringExpander target;

+    protected final String targetType;

+    protected final FlexibleStringExpander targetWindowExdr;

+    protected final String title;

+    protected final String tooltip;

+    protected final String type;

+    protected final boolean useRowSubmit;

     /** Keeps track of conditional fields to help ensure that only one is rendered

      */

-    private final Set<String> useWhenFields;

+    protected final Set<String> useWhenFields;

 

     /** XML Constructor */

-    public ModelForm(Element formElement, String formLocation, ModelReader entityModelReader, DispatchContext dispatchContext) {

+    protected ModelForm(Element formElement, String formLocation, ModelReader entityModelReader, DispatchContext dispatchContext) {

         super(formElement);

         this.formLocation = formLocation;

-        parentModelForm = getParentForm(formElement, entityModelReader, dispatchContext);

+        parentModel = getParentModel(formElement, entityModelReader, dispatchContext);

         int defaultViewSizeInt = DEFAULT_PAGE_SIZE;

         String viewSize = formElement.getAttribute("view-size");

         if (viewSize.isEmpty()) {

-            if (parentModelForm != null) {

-                defaultViewSizeInt = parentModelForm.defaultViewSize;

+            if (parentModel != null) {

+                defaultViewSizeInt = parentModel.defaultViewSize;

             } else {

                 defaultViewSizeInt = UtilProperties.getPropertyAsInteger("widget.properties", "widget.form.defaultViewSize",

                         defaultViewSizeInt);

@@ -215,167 +215,167 @@
         }

         this.defaultViewSize = defaultViewSizeInt;

         String type = formElement.getAttribute("type");

-        if (type.isEmpty() && parentModelForm != null) {

-            type = parentModelForm.type;

+        if (type.isEmpty() && parentModel != null) {

+            type = parentModel.type;

         }

         this.type = type;

         FlexibleStringExpander target = FlexibleStringExpander.getInstance(formElement.getAttribute("target"));

-        if (target.isEmpty() && parentModelForm != null) {

-            target = parentModelForm.target;

+        if (target.isEmpty() && parentModel != null) {

+            target = parentModel.target;

         }

         this.target = target;

         String containerId = formElement.getAttribute("id");

-        if (containerId.isEmpty() && parentModelForm != null) {

-            containerId = parentModelForm.containerId;

+        if (containerId.isEmpty() && parentModel != null) {

+            containerId = parentModel.containerId;

         }

         this.containerId = containerId;

         String containerStyle = formElement.getAttribute("style");

-        if (containerStyle.isEmpty() && parentModelForm != null) {

-            containerStyle = parentModelForm.containerStyle;

+        if (containerStyle.isEmpty() && parentModel != null) {

+            containerStyle = parentModel.containerStyle;

         }

         this.containerStyle = containerStyle;

         String title = formElement.getAttribute("title");

-        if (title.isEmpty() && parentModelForm != null) {

-            title = parentModelForm.title;

+        if (title.isEmpty() && parentModel != null) {

+            title = parentModel.title;

         }

         this.title = title;

         String tooltip = formElement.getAttribute("tooltip");

-        if (tooltip.isEmpty() && parentModelForm != null) {

-            tooltip = parentModelForm.tooltip;

+        if (tooltip.isEmpty() && parentModel != null) {

+            tooltip = parentModel.tooltip;

         }

         this.tooltip = tooltip;

         String listName = formElement.getAttribute("list-name");

         if (listName.isEmpty()) {

-            if (parentModelForm != null) {

-                listName = parentModelForm.listName;

+            if (parentModel != null) {

+                listName = parentModel.listName;

             } else {

                 listName = DEFAULT_FORM_RESULT_LIST_NAME;

             }

         }

         this.listName = listName;

         String listEntryName = formElement.getAttribute("list-entry-name");

-        if (listEntryName.isEmpty() && parentModelForm != null) {

-            listEntryName = parentModelForm.listEntryName;

+        if (listEntryName.isEmpty() && parentModel != null) {

+            listEntryName = parentModel.listEntryName;

         }

         this.listEntryName = listEntryName;

         String defaultEntityName = formElement.getAttribute("default-entity-name");

-        if (defaultEntityName.isEmpty() && parentModelForm != null) {

-            defaultEntityName = parentModelForm.defaultEntityName;

+        if (defaultEntityName.isEmpty() && parentModel != null) {

+            defaultEntityName = parentModel.defaultEntityName;

         }

         this.defaultEntityName = defaultEntityName;

         String defaultServiceName = formElement.getAttribute("default-service-name");

-        if (defaultServiceName.isEmpty() && parentModelForm != null) {

-            defaultServiceName = parentModelForm.defaultServiceName;

+        if (defaultServiceName.isEmpty() && parentModel != null) {

+            defaultServiceName = parentModel.defaultServiceName;

         }

         this.defaultServiceName = defaultServiceName;

         String formTitleAreaStyle = formElement.getAttribute("form-title-area-style");

-        if (formTitleAreaStyle.isEmpty() && parentModelForm != null) {

-            formTitleAreaStyle = parentModelForm.formTitleAreaStyle;

+        if (formTitleAreaStyle.isEmpty() && parentModel != null) {

+            formTitleAreaStyle = parentModel.formTitleAreaStyle;

         }

         this.formTitleAreaStyle = formTitleAreaStyle;

         String formWidgetAreaStyle = formElement.getAttribute("form-widget-area-style");

-        if (formWidgetAreaStyle.isEmpty() && parentModelForm != null) {

-            formWidgetAreaStyle = parentModelForm.formWidgetAreaStyle;

+        if (formWidgetAreaStyle.isEmpty() && parentModel != null) {

+            formWidgetAreaStyle = parentModel.formWidgetAreaStyle;

         }

         this.formWidgetAreaStyle = formWidgetAreaStyle;

         String defaultTitleAreaStyle = formElement.getAttribute("default-title-area-style");

-        if (defaultTitleAreaStyle.isEmpty() && parentModelForm != null) {

-            defaultTitleAreaStyle = parentModelForm.defaultTitleAreaStyle;

+        if (defaultTitleAreaStyle.isEmpty() && parentModel != null) {

+            defaultTitleAreaStyle = parentModel.defaultTitleAreaStyle;

         }

         this.defaultTitleAreaStyle = defaultTitleAreaStyle;

         String defaultWidgetAreaStyle = formElement.getAttribute("default-widget-area-style");

-        if (defaultWidgetAreaStyle.isEmpty() && parentModelForm != null) {

-            defaultWidgetAreaStyle = parentModelForm.defaultWidgetAreaStyle;

+        if (defaultWidgetAreaStyle.isEmpty() && parentModel != null) {

+            defaultWidgetAreaStyle = parentModel.defaultWidgetAreaStyle;

         }

         this.defaultWidgetAreaStyle = defaultWidgetAreaStyle;

         String oddRowStyle = formElement.getAttribute("odd-row-style");

-        if (oddRowStyle.isEmpty() && parentModelForm != null) {

-            oddRowStyle = parentModelForm.oddRowStyle;

+        if (oddRowStyle.isEmpty() && parentModel != null) {

+            oddRowStyle = parentModel.oddRowStyle;

         }

         this.oddRowStyle = oddRowStyle;

         String evenRowStyle = formElement.getAttribute("even-row-style");

-        if (evenRowStyle.isEmpty() && parentModelForm != null) {

-            evenRowStyle = parentModelForm.evenRowStyle;

+        if (evenRowStyle.isEmpty() && parentModel != null) {

+            evenRowStyle = parentModel.evenRowStyle;

         }

         this.evenRowStyle = evenRowStyle;

         String defaultTableStyle = formElement.getAttribute("default-table-style");

-        if (defaultTableStyle.isEmpty() && parentModelForm != null) {

-            defaultTableStyle = parentModelForm.defaultTableStyle;

+        if (defaultTableStyle.isEmpty() && parentModel != null) {

+            defaultTableStyle = parentModel.defaultTableStyle;

         }

         this.defaultTableStyle = defaultTableStyle;

         String headerRowStyle = formElement.getAttribute("header-row-style");

-        if (headerRowStyle.isEmpty() && parentModelForm != null) {

-            headerRowStyle = parentModelForm.headerRowStyle;

+        if (headerRowStyle.isEmpty() && parentModel != null) {

+            headerRowStyle = parentModel.headerRowStyle;

         }

         this.headerRowStyle = headerRowStyle;

         String defaultTitleStyle = formElement.getAttribute("default-title-style");

-        if (defaultTitleStyle.isEmpty() && parentModelForm != null) {

-            defaultTitleStyle = parentModelForm.defaultTitleStyle;

+        if (defaultTitleStyle.isEmpty() && parentModel != null) {

+            defaultTitleStyle = parentModel.defaultTitleStyle;

         }

         this.defaultTitleStyle = defaultTitleStyle;

         String defaultWidgetStyle = formElement.getAttribute("default-widget-style");

-        if (defaultWidgetStyle.isEmpty() && parentModelForm != null) {

-            defaultWidgetStyle = parentModelForm.defaultWidgetStyle;

+        if (defaultWidgetStyle.isEmpty() && parentModel != null) {

+            defaultWidgetStyle = parentModel.defaultWidgetStyle;

         }

         this.defaultWidgetStyle = defaultWidgetStyle;

         String defaultTooltipStyle = formElement.getAttribute("default-tooltip-style");

-        if (defaultTooltipStyle.isEmpty() && parentModelForm != null) {

-            defaultTooltipStyle = parentModelForm.defaultTooltipStyle;

+        if (defaultTooltipStyle.isEmpty() && parentModel != null) {

+            defaultTooltipStyle = parentModel.defaultTooltipStyle;

         }

         this.defaultTooltipStyle = defaultTooltipStyle;

         String itemIndexSeparator = formElement.getAttribute("item-index-separator");

-        if (itemIndexSeparator.isEmpty() && parentModelForm != null) {

-            itemIndexSeparator = parentModelForm.itemIndexSeparator;

+        if (itemIndexSeparator.isEmpty() && parentModel != null) {

+            itemIndexSeparator = parentModel.itemIndexSeparator;

         }

         this.itemIndexSeparator = itemIndexSeparator;

         String separateColumns = formElement.getAttribute("separate-columns");

-        if (separateColumns.isEmpty() && parentModelForm != null) {

-            this.separateColumns = parentModelForm.separateColumns;

+        if (separateColumns.isEmpty() && parentModel != null) {

+            this.separateColumns = parentModel.separateColumns;

         } else {

             this.separateColumns = "true".equals(separateColumns);

         }

         String groupColumns = formElement.getAttribute("group-columns");

-        if (groupColumns.isEmpty() && parentModelForm != null) {

-            this.groupColumns = parentModelForm.groupColumns;

+        if (groupColumns.isEmpty() && parentModel != null) {

+            this.groupColumns = parentModel.groupColumns;

         } else {

             this.groupColumns = !"false".equals(groupColumns);

         }

         String targetType = formElement.getAttribute("target-type");

-        if (targetType.isEmpty() && parentModelForm != null) {

-            targetType = parentModelForm.targetType;

+        if (targetType.isEmpty() && parentModel != null) {

+            targetType = parentModel.targetType;

         }

         this.targetType = targetType;

         FlexibleMapAccessor<Map<String, ? extends Object>> defaultMapName = FlexibleMapAccessor.getInstance(formElement

                 .getAttribute("default-map-name"));

-        if (defaultMapName.isEmpty() && parentModelForm != null) {

-            defaultMapName = parentModelForm.defaultMapName;

+        if (defaultMapName.isEmpty() && parentModel != null) {

+            defaultMapName = parentModel.defaultMapName;

         }

         this.defaultMapName = defaultMapName;

         FlexibleStringExpander targetWindowExdr = FlexibleStringExpander.getInstance(formElement.getAttribute("target-window"));

-        if (targetWindowExdr.isEmpty() && parentModelForm != null) {

-            targetWindowExdr = parentModelForm.targetWindowExdr;

+        if (targetWindowExdr.isEmpty() && parentModel != null) {

+            targetWindowExdr = parentModel.targetWindowExdr;

         }

         this.targetWindowExdr = targetWindowExdr;

         String hideHeader = formElement.getAttribute("hide-header");

-        if (hideHeader.isEmpty() && parentModelForm != null) {

-            this.hideHeader = parentModelForm.hideHeader;

+        if (hideHeader.isEmpty() && parentModel != null) {

+            this.hideHeader = parentModel.hideHeader;

         } else {

             this.hideHeader = "true".equals(hideHeader);

         }

         String clientAutocompleteFields = formElement.getAttribute("client-autocomplete-fields");

-        if (clientAutocompleteFields.isEmpty() && parentModelForm != null) {

-            this.clientAutocompleteFields = parentModelForm.clientAutocompleteFields;

+        if (clientAutocompleteFields.isEmpty() && parentModel != null) {

+            this.clientAutocompleteFields = parentModel.clientAutocompleteFields;

         } else {

             this.clientAutocompleteFields = !"false".equals(formElement.getAttribute("client-autocomplete-fields"));

         }

         FlexibleStringExpander paginateTarget = FlexibleStringExpander.getInstance(formElement.getAttribute("paginate-target"));

-        if (paginateTarget.isEmpty() && parentModelForm != null) {

-            paginateTarget = parentModelForm.paginateTarget;

+        if (paginateTarget.isEmpty() && parentModel != null) {

+            paginateTarget = parentModel.paginateTarget;

         }

         this.paginateTarget = paginateTarget;

         ArrayList<AltTarget> altTargets = new ArrayList<AltTarget>();

-        if (parentModelForm != null) {

-            altTargets.addAll(parentModelForm.altTargets);

+        if (parentModel != null) {

+            altTargets.addAll(parentModel.altTargets);

         }

         for (Element altTargetElement : UtilXml.childElementList(formElement, "alt-target")) {

             altTargets.add(new AltTarget(altTargetElement));

@@ -383,8 +383,8 @@
         altTargets.trimToSize();

         this.altTargets = Collections.unmodifiableList(altTargets);

         ArrayList<ModelAction> actions = new ArrayList<ModelAction>();

-        if (parentModelForm != null) {

-            actions.addAll(parentModelForm.actions);

+        if (parentModel != null) {

+            actions.addAll(parentModel.actions);

         }

         Element actionsElement = UtilXml.firstChildElement(formElement, "actions");

         if (actionsElement != null) {

@@ -393,8 +393,8 @@
         actions.trimToSize();

         this.actions = Collections.unmodifiableList(actions);

         ArrayList<ModelAction> rowActions = new ArrayList<ModelAction>();

-        if (parentModelForm != null) {

-            rowActions.addAll(parentModelForm.rowActions);

+        if (parentModel != null) {

+            rowActions.addAll(parentModel.rowActions);

         }

         Element rowActionsElement = UtilXml.firstChildElement(formElement, "row-actions");

         if (rowActionsElement != null) {

@@ -405,10 +405,10 @@
         ArrayList<UpdateArea> onPaginateUpdateAreas = new ArrayList<UpdateArea>();

         ArrayList<UpdateArea> onSubmitUpdateAreas = new ArrayList<UpdateArea>();

         ArrayList<UpdateArea> onSortColumnUpdateAreas = new ArrayList<UpdateArea>();

-        if (parentModelForm != null) {

-            onPaginateUpdateAreas.addAll(parentModelForm.onPaginateUpdateAreas);

-            onSubmitUpdateAreas.addAll(parentModelForm.onSubmitUpdateAreas);

-            onSortColumnUpdateAreas.addAll(parentModelForm.onSortColumnUpdateAreas);

+        if (parentModel != null) {

+            onPaginateUpdateAreas.addAll(parentModel.onPaginateUpdateAreas);

+            onSubmitUpdateAreas.addAll(parentModel.onSubmitUpdateAreas);

+            onSortColumnUpdateAreas.addAll(parentModel.onSortColumnUpdateAreas);

         }

         for (Element updateAreaElement : UtilXml.childElementList(formElement, "on-event-update-area")) {

             UpdateArea updateArea = new UpdateArea(updateAreaElement, defaultServiceName, defaultEntityName);

@@ -452,8 +452,8 @@
         onSortColumnUpdateAreas.trimToSize();

         this.onSortColumnUpdateAreas = Collections.unmodifiableList(onSortColumnUpdateAreas);

         ArrayList<AltRowStyle> altRowStyles = new ArrayList<AltRowStyle>();

-        if (parentModelForm != null) {

-            altRowStyles.addAll(parentModelForm.altRowStyles);

+        if (parentModel != null) {

+            altRowStyles.addAll(parentModel.altRowStyles);

         }

         for (Element altRowStyleElement : UtilXml.childElementList(formElement, "alt-row-style")) {

             AltRowStyle altRowStyle = new AltRowStyle(altRowStyleElement);

@@ -462,14 +462,14 @@
         altRowStyles.trimToSize();

         this.altRowStyles = Collections.unmodifiableList(altRowStyles);

         Set<String> useWhenFields = new HashSet<String>();

-        if (parentModelForm != null) {

-            useWhenFields.addAll(parentModelForm.useWhenFields);

+        if (parentModel != null) {

+            useWhenFields.addAll(parentModel.useWhenFields);

         }

         ArrayList<ModelFormFieldBuilder> fieldBuilderList = new ArrayList<ModelFormFieldBuilder>();

         Map<String, ModelFormFieldBuilder> fieldBuilderMap = new HashMap<String, ModelFormFieldBuilder>();

-        if (parentModelForm != null) {

-            // Create this fieldList/Map from clones of parentModelForm's

-            for (ModelFormField parentChildField : parentModelForm.fieldList) {

+        if (parentModel != null) {

+            // Create this fieldList/Map from clones of parentModel's

+            for (ModelFormField parentChildField : parentModel.fieldList) {

                 ModelFormFieldBuilder builder = new ModelFormFieldBuilder(parentChildField);

                 builder.setModelForm(this);

                 fieldBuilderList.add(builder);

@@ -477,131 +477,131 @@
             }

         }

         Map<String, FieldGroupBase> fieldGroupMap = new HashMap<String, FieldGroupBase>();

-        if (parentModelForm != null) {

-            fieldGroupMap.putAll(parentModelForm.fieldGroupMap);

+        if (parentModel != null) {

+            fieldGroupMap.putAll(parentModel.fieldGroupMap);

         }

         ArrayList<FieldGroupBase> fieldGroupList = new ArrayList<FieldGroupBase>();

-        if (parentModelForm != null) {

-            fieldGroupList.addAll(parentModelForm.fieldGroupList);

+        if (parentModel != null) {

+            fieldGroupList.addAll(parentModel.fieldGroupList);

         }

         ArrayList<String> lastOrderFields = new ArrayList<String>();

-        if (parentModelForm != null) {

-            lastOrderFields.addAll(parentModelForm.lastOrderFields);

+        if (parentModel != null) {

+            lastOrderFields.addAll(parentModel.lastOrderFields);

         }

         String sortFieldParameterName = formElement.getAttribute("sort-field-parameter-name");

-        if (sortFieldParameterName.isEmpty() && parentModelForm != null) {

-            this.sortFieldParameterName = parentModelForm.targetType;

+        if (sortFieldParameterName.isEmpty() && parentModel != null) {

+            this.sortFieldParameterName = parentModel.targetType;

         } else {

             this.sortFieldParameterName = "sortField";

         }

         String defaultRequiredFieldStyle = formElement.getAttribute("default-required-field-style");

-        if (defaultRequiredFieldStyle.isEmpty() && parentModelForm != null) {

-            defaultRequiredFieldStyle = parentModelForm.defaultRequiredFieldStyle;

+        if (defaultRequiredFieldStyle.isEmpty() && parentModel != null) {

+            defaultRequiredFieldStyle = parentModel.defaultRequiredFieldStyle;

         }

         this.defaultRequiredFieldStyle = defaultRequiredFieldStyle;

         String defaultSortFieldStyle = formElement.getAttribute("default-sort-field-style");

-        if (defaultSortFieldStyle.isEmpty() && parentModelForm != null) {

-            this.defaultSortFieldStyle = parentModelForm.defaultSortFieldStyle;

+        if (defaultSortFieldStyle.isEmpty() && parentModel != null) {

+            this.defaultSortFieldStyle = parentModel.defaultSortFieldStyle;

         } else {

             this.defaultSortFieldStyle = DEFAULT_SORT_FIELD_STYLE;

         }

         String defaultSortFieldAscStyle = formElement.getAttribute("default-sort-field-asc-style");

-        if (defaultSortFieldAscStyle.isEmpty() && parentModelForm != null) {

-            this.defaultSortFieldAscStyle = parentModelForm.defaultSortFieldAscStyle;

+        if (defaultSortFieldAscStyle.isEmpty() && parentModel != null) {

+            this.defaultSortFieldAscStyle = parentModel.defaultSortFieldAscStyle;

         } else {

             this.defaultSortFieldAscStyle = DEFAULT_SORT_FIELD_ASC_STYLE;

         }

         String defaultSortFieldDescStyle = formElement.getAttribute("default-sort-field-desc-style");

-        if (defaultSortFieldDescStyle.isEmpty() && parentModelForm != null) {

-            this.defaultSortFieldDescStyle = parentModelForm.defaultSortFieldDescStyle;

+        if (defaultSortFieldDescStyle.isEmpty() && parentModel != null) {

+            this.defaultSortFieldDescStyle = parentModel.defaultSortFieldDescStyle;

         } else {

             this.defaultSortFieldDescStyle = DEFAULT_SORT_FIELD_DESC_STYLE;

         }

         String paginateTargetAnchor = formElement.getAttribute("paginate-target-anchor");

-        if (paginateTargetAnchor.isEmpty() && parentModelForm != null) {

-            paginateTargetAnchor = parentModelForm.paginateTargetAnchor;

+        if (paginateTargetAnchor.isEmpty() && parentModel != null) {

+            paginateTargetAnchor = parentModel.paginateTargetAnchor;

         }

         this.paginateTargetAnchor = paginateTargetAnchor;

         FlexibleStringExpander paginateIndexField = FlexibleStringExpander.getInstance(formElement

                 .getAttribute("paginate-index-field"));

-        if (paginateIndexField.isEmpty() && parentModelForm != null) {

-            paginateIndexField = parentModelForm.paginateIndexField;

+        if (paginateIndexField.isEmpty() && parentModel != null) {

+            paginateIndexField = parentModel.paginateIndexField;

         }

         this.paginateIndexField = paginateIndexField;

         FlexibleStringExpander paginateSizeField = FlexibleStringExpander.getInstance(formElement

                 .getAttribute("paginate-size-field"));

-        if (paginateSizeField.isEmpty() && parentModelForm != null) {

-            paginateSizeField = parentModelForm.paginateSizeField;

+        if (paginateSizeField.isEmpty() && parentModel != null) {

+            paginateSizeField = parentModel.paginateSizeField;

         }

         this.paginateSizeField = paginateSizeField;

         FlexibleStringExpander overrideListSize = FlexibleStringExpander.getInstance(formElement

                 .getAttribute("override-list-size"));

-        if (overrideListSize.isEmpty() && parentModelForm != null) {

-            overrideListSize = parentModelForm.overrideListSize;

+        if (overrideListSize.isEmpty() && parentModel != null) {

+            overrideListSize = parentModel.overrideListSize;

         }

         this.overrideListSize = overrideListSize;

         FlexibleStringExpander paginateFirstLabel = FlexibleStringExpander.getInstance(formElement

                 .getAttribute("paginate-first-label"));

-        if (paginateFirstLabel.isEmpty() && parentModelForm != null) {

-            paginateFirstLabel = parentModelForm.paginateFirstLabel;

+        if (paginateFirstLabel.isEmpty() && parentModel != null) {

+            paginateFirstLabel = parentModel.paginateFirstLabel;

         }

         this.paginateFirstLabel = paginateFirstLabel;

         FlexibleStringExpander paginatePreviousLabel = FlexibleStringExpander.getInstance(formElement

                 .getAttribute("paginate-previous-label"));

-        if (paginatePreviousLabel.isEmpty() && parentModelForm != null) {

-            paginatePreviousLabel = parentModelForm.paginatePreviousLabel;

+        if (paginatePreviousLabel.isEmpty() && parentModel != null) {

+            paginatePreviousLabel = parentModel.paginatePreviousLabel;

         }

         this.paginatePreviousLabel = paginatePreviousLabel;

         FlexibleStringExpander paginateNextLabel = FlexibleStringExpander.getInstance(formElement

                 .getAttribute("paginate-next-label"));

-        if (paginateNextLabel.isEmpty() && parentModelForm != null) {

-            paginateNextLabel = parentModelForm.paginateNextLabel;

+        if (paginateNextLabel.isEmpty() && parentModel != null) {

+            paginateNextLabel = parentModel.paginateNextLabel;

         }

         this.paginateNextLabel = paginateNextLabel;

         FlexibleStringExpander paginateLastLabel = FlexibleStringExpander.getInstance(formElement

                 .getAttribute("paginate-last-label"));

-        if (paginateLastLabel.isEmpty() && parentModelForm != null) {

-            paginateLastLabel = parentModelForm.paginateLastLabel;

+        if (paginateLastLabel.isEmpty() && parentModel != null) {

+            paginateLastLabel = parentModel.paginateLastLabel;

         }

         this.paginateLastLabel = paginateLastLabel;

         FlexibleStringExpander paginateViewSizeLabel = FlexibleStringExpander.getInstance(formElement

                 .getAttribute("paginate-viewsize-label"));

-        if (paginateViewSizeLabel.isEmpty() && parentModelForm != null) {

-            paginateViewSizeLabel = parentModelForm.paginateViewSizeLabel;

+        if (paginateViewSizeLabel.isEmpty() && parentModel != null) {

+            paginateViewSizeLabel = parentModel.paginateViewSizeLabel;

         }

         this.paginateViewSizeLabel = paginateViewSizeLabel;

         String paginateStyle = formElement.getAttribute("paginate-style");

-        if (paginateStyle.isEmpty() && parentModelForm != null) {

-            this.paginateStyle = parentModelForm.paginateStyle;

+        if (paginateStyle.isEmpty() && parentModel != null) {

+            this.paginateStyle = parentModel.paginateStyle;

         } else {

             this.paginateStyle = DEFAULT_PAG_STYLE;

         }

         FlexibleStringExpander paginate = FlexibleStringExpander.getInstance(formElement.getAttribute("paginate"));

-        if (paginate.isEmpty() && parentModelForm != null) {

-            paginate = parentModelForm.paginate;

+        if (paginate.isEmpty() && parentModel != null) {

+            paginate = parentModel.paginate;

         }

         this.paginate = paginate;

         String skipStart = formElement.getAttribute("skip-start");

-        if (skipStart.isEmpty() && parentModelForm != null) {

-            this.skipStart = parentModelForm.skipStart;

+        if (skipStart.isEmpty() && parentModel != null) {

+            this.skipStart = parentModel.skipStart;

         } else {

             this.skipStart = "true".equals(skipStart);

         }

         String skipEnd = formElement.getAttribute("skip-end");

-        if (skipEnd.isEmpty() && parentModelForm != null) {

-            this.skipEnd = parentModelForm.skipEnd;

+        if (skipEnd.isEmpty() && parentModel != null) {

+            this.skipEnd = parentModel.skipEnd;

         } else {

             this.skipEnd = "true".equals(skipEnd);

         }

         String useRowSubmit = formElement.getAttribute("use-row-submit");

-        if (useRowSubmit.isEmpty() && parentModelForm != null) {

-            this.useRowSubmit = parentModelForm.useRowSubmit;

+        if (useRowSubmit.isEmpty() && parentModel != null) {

+            this.useRowSubmit = parentModel.useRowSubmit;

         } else {

             this.useRowSubmit = "true".equals(useRowSubmit);

         }

         FlexibleStringExpander rowCountExdr = FlexibleStringExpander.getInstance(formElement.getAttribute("row-count"));

-        if (rowCountExdr.isEmpty() && parentModelForm != null) {

-            rowCountExdr = parentModelForm.rowCountExdr;

+        if (rowCountExdr.isEmpty() && parentModel != null) {

+            rowCountExdr = parentModel.rowCountExdr;

         }

         this.rowCountExdr = paginate;

         ArrayList<ModelFormFieldBuilder> multiSubmitBuilders = new ArrayList<ModelFormFieldBuilder>();

@@ -728,17 +728,12 @@
         sortOrderFields.trimToSize();

         this.sortOrderFields = Collections.unmodifiableList(sortOrderFields);

         String focusFieldName = formElement.getAttribute("focus-field-name");

-        if (focusFieldName.isEmpty() && parentModelForm != null) {

-            focusFieldName = parentModelForm.focusFieldName;

+        if (focusFieldName.isEmpty() && parentModel != null) {

+            focusFieldName = parentModel.focusFieldName;

         }

         this.focusFieldName = focusFieldName;

     }

 

-    @Override

-    public void accept(ModelWidgetVisitor visitor) throws Exception {

-        visitor.visit(this);

-    }

-

     private void addAutoFieldsFromEntity(AutoFieldsEntity autoFieldsEntity, ModelReader entityModelReader,

             Set<String> useWhenFields, List<ModelFormFieldBuilder> fieldBuilderList, Map<String, ModelFormFieldBuilder> fieldBuilderMap) {

         // read entity def and auto-create fields

@@ -1245,51 +1240,18 @@
         return field;

     }

 

-    private ModelForm getParentForm(Element formElement, ModelReader entityModelReader, DispatchContext dispatchContext) {

-        ModelForm parent = null;

-        String parentResource = formElement.getAttribute("extends-resource");

-        String parentForm = formElement.getAttribute("extends");

-        if (parentForm.length() > 0) {

-            // check if we have a resource name (part of the string before the ?)

-            if (parentResource.length() > 0) {

-                try {

-                    parent = FormFactory.getFormFromLocation(parentResource, parentForm, entityModelReader, dispatchContext);

-                } catch (Exception e) {

-                    Debug.logError(e, "Failed to load parent form definition '" + parentForm + "' at resource '" + parentResource

-                            + "'", module);

-                }

-            } else if (!parentForm.equals(formElement.getAttribute("name"))) {

-                // try to find a form definition in the same file

-                Element rootElement = formElement.getOwnerDocument().getDocumentElement();

-                List<? extends Element> formElements = UtilXml.childElementList(rootElement, "form");

-                //Uncomment below to add support for abstract forms

-                //formElements.addAll(UtilXml.childElementList(rootElement, "abstract-form"));

-                for (Element formElementEntry : formElements) {

-                    if (formElementEntry.getAttribute("name").equals(parentForm)) {

-                        parent = new ModelForm(formElementEntry, parentResource, entityModelReader, dispatchContext);

-                        break;

-                    }

-                }

-                if (parent == null) {

-                    Debug.logError("Failed to find parent form definition '" + parentForm + "' in same document.", module);

-                }

-            } else {

-                Debug.logError("Recursive form definition found for '" + formElement.getAttribute("name") + ".'", module);

-            }

-        }

-        return parent;

-    }

+    protected abstract ModelForm getParentModel(Element formElement, ModelReader entityModelReader, DispatchContext dispatchContext);

 

     public String getParentFormLocation() {

-        return this.parentModelForm == null ? null : this.parentModelForm.getFormLocation();

+        return this.parentModel == null ? null : this.parentModel.getFormLocation();

     }

 

     public String getParentFormName() {

-        return this.parentModelForm == null ? null : this.parentModelForm.getName();

+        return this.parentModel == null ? null : this.parentModel.getName();

     }

 

     public ModelForm getParentModelForm() {

-        return parentModelForm;

+        return parentModel;

     }

 

     public String getPassedRowCount(Map<String, Object> context) {

@@ -1588,12 +1550,12 @@
     public static class FieldGroup implements FieldGroupBase {

         private static AtomicInteger baseSeqNo = new AtomicInteger(0);

         private static final String baseId = "_G";

-        private final String id;

-        private final String style;

-        private final String title;

-        private final boolean collapsible;

-        private final boolean initiallyCollapsed;

-        private final ModelForm modelForm;

+        protected final String id;

+        protected final String style;

+        protected final String title;

+        protected final boolean collapsible;

+        protected final boolean initiallyCollapsed;

+        protected final ModelForm modelForm;

 

         public FieldGroup(Element sortOrderElement, ModelForm modelForm, List<SortField> sortOrderFields,

                 Map<String, FieldGroupBase> fieldGroupMap) {

@@ -1694,8 +1656,8 @@
     }

 

     public static class SortField {

-        private final String fieldName;

-        private final Integer position;

+        protected final String fieldName;

+        protected final Integer position;

 

         public SortField(String name) {

             this(name, null);

@@ -1728,14 +1690,14 @@
      * elements used in form widgets.

      */

     public static class UpdateArea {

-        private final String eventType;

-        private final String areaId;

-        private final String areaTarget;

-        private final String defaultServiceName;

-        private final String defaultEntityName;

-        private final CommonWidgetModels.AutoEntityParameters autoEntityParameters;

-        private final CommonWidgetModels.AutoServiceParameters autoServiceParameters;

-        private final List<CommonWidgetModels.Parameter> parameterList;

+        protected final String eventType;

+        protected final String areaId;

+        protected final String areaTarget;

+        protected final String defaultServiceName;

+        protected final String defaultEntityName;

+        protected final CommonWidgetModels.AutoEntityParameters autoEntityParameters;

+        protected final CommonWidgetModels.AutoServiceParameters autoServiceParameters;

+        protected final List<CommonWidgetModels.Parameter> parameterList;

 

         public UpdateArea(Element updateAreaElement) {

             this(updateAreaElement, null, null);

diff --git a/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java b/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java
index 4e6f3c6..561e1f7 100644
--- a/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java
+++ b/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java
@@ -2102,12 +2102,15 @@
         private final FlexibleStringExpander description;

         private final boolean requestConfirmation;

         private final Link link;

+

         public HyperlinkField(Element element, ModelFormField modelFormField) {

             super(element, modelFormField);

             this.alsoHidden = !"false".equals(element.getAttribute("also-hidden"));

             this.confirmationMsgExdr = FlexibleStringExpander.getInstance(element.getAttribute("confirmation-message"));

             this.description = FlexibleStringExpander.getInstance(element.getAttribute("description"));

             this.requestConfirmation = "true".equals(element.getAttribute("request-confirmation"));

+            // Backwards-compatible fix

+            element.setAttribute("url-mode", element.getAttribute("target-type"));

             this.link = new Link(element);

         }

 

@@ -3145,6 +3148,9 @@
         public SubHyperlink(Element element, ModelFormField modelFormField) {

             this.description = FlexibleStringExpander.getInstance(element.getAttribute("description"));

             this.useWhen = FlexibleStringExpander.getInstance(element.getAttribute("use-when"));

+            // Backwards compatible support

+            element.setAttribute("style", element.getAttribute("link-style"));

+            element.setAttribute("url-mode", element.getAttribute("target-type"));

             this.link = new Link(element);

             this.modelFormField = modelFormField;

         }

diff --git a/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java b/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java
new file mode 100644
index 0000000..ab8daa7
--- /dev/null
+++ b/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java
@@ -0,0 +1,656 @@
+/*******************************************************************************

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ * http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ *******************************************************************************/

+package org.ofbiz.widget.model;

+

+import java.util.List;

+import java.util.Locale;

+import java.util.Map;

+import java.util.Set;

+

+import org.ofbiz.base.util.BshUtil;

+import org.ofbiz.base.util.Debug;

+import org.ofbiz.base.util.StringUtil;

+import org.ofbiz.base.util.UtilCodec;

+import org.ofbiz.base.util.UtilGenerics;

+import org.ofbiz.base.util.UtilProperties;

+import org.ofbiz.base.util.UtilValidate;

+import org.ofbiz.base.util.UtilXml;

+import org.ofbiz.base.util.string.FlexibleStringExpander;

+import org.ofbiz.entity.model.ModelReader;

+import org.ofbiz.service.DispatchContext;

+import org.ofbiz.widget.WidgetWorker;

+import org.w3c.dom.Element;

+

+import bsh.EvalError;

+import bsh.Interpreter;

+

+/**

+ * Models the &lt;grid&gt; element.

+ * 

+ * @see <code>widget-form.xsd</code>

+ */

+@SuppressWarnings("serial")

+public class ModelGrid extends ModelForm {

+

+    /*

+     * ----------------------------------------------------------------------- *

+     *                     DEVELOPERS PLEASE READ

+     * ----------------------------------------------------------------------- *

+     * 

+     * This model is intended to be a read-only data structure that represents

+     * an XML element. Outside of object construction, the class should not

+     * have any behaviors. All behavior should be contained in model visitors.

+     * 

+     * Instances of this class will be shared by multiple threads - therefore

+     * it is immutable. DO NOT CHANGE THE OBJECT'S STATE AT RUN TIME!

+     * 

+     * BE VERY CAREFUL when implementing "extends" - parent form collections

+     * must be added to child collections, not replace them. In other words,

+     * do not assign parent collection fields to child collection fields.

+     * 

+     */

+

+    public static final String module = ModelGrid.class.getName();

+

+    /** XML Constructor */

+    public ModelGrid(Element formElement, String formLocation, ModelReader entityModelReader, DispatchContext dispatchContext) {

+        super(formElement, formLocation, entityModelReader, dispatchContext);

+    }

+

+    @Override

+    public void accept(ModelWidgetVisitor visitor) throws Exception {

+        visitor.visit(this);

+    }

+

+    public List<ModelAction> getActions() {

+        return actions;

+    }

+

+    public List<AltRowStyle> getAltRowStyles() {

+        return altRowStyles;

+    }

+

+    public List<AltTarget> getAltTargets() {

+        return altTargets;

+    }

+

+    public List<AutoFieldsEntity> getAutoFieldsEntities() {

+        return autoFieldsEntities;

+    }

+

+    public List<AutoFieldsService> getAutoFieldsServices() {

+        return autoFieldsServices;

+    }

+

+    public Interpreter getBshInterpreter(Map<String, Object> context) throws EvalError {

+        Interpreter bsh = (Interpreter) context.get("bshInterpreter");

+        if (bsh == null) {

+            bsh = BshUtil.makeInterpreter(context);

+            context.put("bshInterpreter", bsh);

+        }

+        return bsh;

+    }

+

+    @Override

+    public String getBoundaryCommentName() {

+        return formLocation + "#" + getName();

+    }

+

+    public boolean getClientAutocompleteFields() {

+        return this.clientAutocompleteFields;

+    }

+

+    public String getContainerId() {

+        // use the name if there is no id

+        if (UtilValidate.isNotEmpty(this.containerId)) {

+            return this.containerId;

+        } else {

+            return this.getName();

+        }

+    }

+

+    public String getContainerStyle() {

+        return this.containerStyle;

+    }

+

+    public String getDefaultEntityName() {

+        return this.defaultEntityName;

+    }

+

+    public FieldGroup getDefaultFieldGroup() {

+        return defaultFieldGroup;

+    }

+

+    public Map<String, ? extends Object> getDefaultMap(Map<String, ? extends Object> context) {

+        return this.defaultMapName.get(context);

+    }

+

+    public String getDefaultMapName() {

+        return this.defaultMapName.getOriginalName();

+    }

+

+    public String getDefaultRequiredFieldStyle() {

+        return this.defaultRequiredFieldStyle;

+    }

+

+    public String getDefaultServiceName() {

+        return this.defaultServiceName;

+    }

+

+    public String getDefaultSortFieldAscStyle() {

+        return this.defaultSortFieldAscStyle;

+    }

+

+    public String getDefaultSortFieldDescStyle() {

+        return this.defaultSortFieldDescStyle;

+    }

+

+    public String getDefaultSortFieldStyle() {

+        return this.defaultSortFieldStyle;

+    }

+

+    public String getDefaultTableStyle() {

+        return this.defaultTableStyle;

+    }

+

+    public String getDefaultTitleAreaStyle() {

+        return this.defaultTitleAreaStyle;

+    }

+

+    public String getDefaultTitleStyle() {

+        return this.defaultTitleStyle;

+    }

+

+    public String getDefaultTooltipStyle() {

+        return this.defaultTooltipStyle;

+    }

+

+    public int getDefaultViewSize() {

+        return defaultViewSize;

+    }

+

+    public String getDefaultWidgetAreaStyle() {

+        return this.defaultWidgetAreaStyle;

+    }

+

+    public String getDefaultWidgetStyle() {

+        return this.defaultWidgetStyle;

+    }

+

+    public String getEvenRowStyle() {

+        return this.evenRowStyle;

+    }

+

+    public List<FieldGroupBase> getFieldGroupList() {

+        return fieldGroupList;

+    }

+

+    public Map<String, FieldGroupBase> getFieldGroupMap() {

+        return fieldGroupMap;

+    }

+

+    public List<ModelFormField> getFieldList() {

+        return fieldList;

+    }

+

+    public String getFocusFieldName() {

+        return focusFieldName;

+    }

+

+    public String getFormLocation() {

+        return this.formLocation;

+    }

+

+    public String getFormTitleAreaStyle() {

+        return this.formTitleAreaStyle;

+    }

+

+    public String getFormWidgetAreaStyle() {

+        return this.formWidgetAreaStyle;

+    }

+

+    public String getHeaderRowStyle() {

+        return this.headerRowStyle;

+    }

+

+    public boolean getHideHeader() {

+        return this.hideHeader;

+    }

+

+    public String getItemIndexSeparator() {

+        if (UtilValidate.isNotEmpty(this.itemIndexSeparator)) {

+            return this.itemIndexSeparator;

+        } else {

+            return "_o_";

+        }

+    }

+

+    public List<String> getLastOrderFields() {

+        return lastOrderFields;

+    }

+

+    public String getListEntryName() {

+        return this.listEntryName;

+    }

+

+    public String getListName() {

+        return this.listName;

+    }

+

+    public String getMultiPaginateIndexField(Map<String, Object> context) {

+        String field = this.paginateIndexField.expandString(context);

+        if (UtilValidate.isEmpty(field)) {

+            field = DEFAULT_PAG_INDEX_FIELD;

+        }

+        //  append the paginator number

+        field = field + "_" + WidgetWorker.getPaginatorNumber(context);

+        return field;

+    }

+

+    public String getMultiPaginateSizeField(Map<String, Object> context) {

+        String field = this.paginateSizeField.expandString(context);

+        if (UtilValidate.isEmpty(field)) {

+            field = DEFAULT_PAG_SIZE_FIELD;

+        }

+        //  append the paginator number

+        field = field + "_" + WidgetWorker.getPaginatorNumber(context);

+        return field;

+    }

+

+    public List<ModelFormField> getMultiSubmitFields() {

+        return this.multiSubmitFields;

+    }

+

+    public String getOddRowStyle() {

+        return this.oddRowStyle;

+    }

+

+    public List<UpdateArea> getOnPaginateUpdateAreas() {

+        return this.onPaginateUpdateAreas;

+    }

+

+    public List<UpdateArea> getOnSortColumnUpdateAreas() {

+        return this.onSortColumnUpdateAreas;

+    }

+

+    /* Returns the list of ModelForm.UpdateArea objects.

+     */

+    public List<UpdateArea> getOnSubmitUpdateAreas() {

+        return this.onSubmitUpdateAreas;

+    }

+

+    public String getOverrideListSize() {

+        return overrideListSize.getOriginal();

+    }

+

+    public int getOverrideListSize(Map<String, Object> context) {

+        int listSize = 0;

+        if (!this.overrideListSize.isEmpty()) {

+            String size = this.overrideListSize.expandString(context);

+            try {

+                size = size.replaceAll("[^0-9.]", "");

+                listSize = Integer.parseInt(size);

+            } catch (NumberFormatException e) {

+                Debug.logError(e, "Error getting override list size from value " + size, module);

+            }

+        }

+        return listSize;

+    }

+

+    public String getPaginate() {

+        return paginate.getOriginal();

+    }

+

+    public boolean getPaginate(Map<String, Object> context) {

+        String paginate = this.paginate.expandString(context);

+        if (!paginate.isEmpty()) {

+            return Boolean.valueOf(paginate).booleanValue();

+        } else {

+            return true;

+        }

+    }

+

+    public String getPaginateFirstLabel() {

+        return paginateFirstLabel.getOriginal();

+    }

+

+    public String getPaginateFirstLabel(Map<String, Object> context) {

+        Locale locale = (Locale) context.get("locale");

+        String field = this.paginateFirstLabel.expandString(context);

+        if (UtilValidate.isEmpty(field)) {

+            field = UtilProperties.getMessage("CommonUiLabels", "CommonFirst", locale);

+        }

+        return field;

+    }

+

+    public String getPaginateFirstStyle() {

+        return DEFAULT_PAG_FIRST_STYLE;

+    }

+

+    public String getPaginateIndexField() {

+        return paginateIndexField.getOriginal();

+    }

+

+    public String getPaginateIndexField(Map<String, Object> context) {

+        String field = this.paginateIndexField.expandString(context);

+        if (field.isEmpty()) {

+            return DEFAULT_PAG_INDEX_FIELD;

+        }

+        return field;

+    }

+

+    public String getPaginateLastLabel() {

+        return paginateLastLabel.getOriginal();

+    }

+

+    public String getPaginateLastLabel(Map<String, Object> context) {

+        Locale locale = (Locale) context.get("locale");

+        String field = this.paginateLastLabel.expandString(context);

+        if (UtilValidate.isEmpty(field)) {

+            field = UtilProperties.getMessage("CommonUiLabels", "CommonLast", locale);

+        }

+        return field;

+    }

+

+    public String getPaginateLastStyle() {

+        return DEFAULT_PAG_LAST_STYLE;

+    }

+

+    public String getPaginateNextLabel() {

+        return paginateNextLabel.getOriginal();

+    }

+

+    public String getPaginateNextLabel(Map<String, Object> context) {

+        String field = this.paginateNextLabel.expandString(context);

+        if (field.isEmpty()) {

+            Locale locale = (Locale) context.get("locale");

+            return UtilProperties.getMessage("CommonUiLabels", "CommonNext", locale);

+        }

+        return field;

+    }

+

+    public String getPaginateNextStyle() {

+        return DEFAULT_PAG_NEXT_STYLE;

+    }

+

+    public String getPaginatePreviousLabel() {

+        return paginatePreviousLabel.getOriginal();

+    }

+

+    public String getPaginatePreviousLabel(Map<String, Object> context) {

+        String field = this.paginatePreviousLabel.expandString(context);

+        if (field.isEmpty()) {

+            Locale locale = (Locale) context.get("locale");

+            field = UtilProperties.getMessage("CommonUiLabels", "CommonPrevious", locale);

+        }

+        return field;

+    }

+

+    public String getPaginatePreviousStyle() {

+        return DEFAULT_PAG_PREV_STYLE;

+    }

+

+    public String getPaginateSizeField() {

+        return paginateSizeField.getOriginal();

+    }

+

+    public String getPaginateSizeField(Map<String, Object> context) {

+        String field = this.paginateSizeField.expandString(context);

+        if (field.isEmpty()) {

+            return DEFAULT_PAG_SIZE_FIELD;

+        }

+        return field;

+    }

+

+    public String getPaginateStyle() {

+        return this.paginateStyle;

+    }

+

+    public String getPaginateTarget() {

+        return paginateTarget.getOriginal();

+    }

+

+    public String getPaginateTarget(Map<String, Object> context) {

+        String targ = this.paginateTarget.expandString(context);

+        if (targ.isEmpty()) {

+            Map<String, ?> parameters = UtilGenerics.cast(context.get("parameters"));

+            if (parameters != null && parameters.containsKey("targetRequestUri")) {

+                targ = (String) parameters.get("targetRequestUri");

+            }

+        }

+        return targ;

+    }

+

+    public String getPaginateTargetAnchor() {

+        return this.paginateTargetAnchor;

+    }

+

+    public String getPaginateViewSizeLabel() {

+        return paginateViewSizeLabel.getOriginal();

+    }

+

+    public String getPaginateViewSizeLabel(Map<String, Object> context) {

+        String field = this.paginateViewSizeLabel.expandString(context);

+        if (field.isEmpty()) {

+            Locale locale = (Locale) context.get("locale");

+            return UtilProperties.getMessage("CommonUiLabels", "CommonItemsPerPage", locale);

+        }

+        return field;

+    }

+

+    protected ModelForm getParentModel(Element gridElement, ModelReader entityModelReader, DispatchContext dispatchContext) {

+        ModelForm parentModel = null;

+        String parentResource = gridElement.getAttribute("extends-resource");

+        String parentGrid = gridElement.getAttribute("extends");

+        String gridType = gridElement.getAttribute("type");

+        if (!parentGrid.isEmpty()) {

+            // check if we have a resource name

+            if (!parentResource.isEmpty()) {

+                try {

+                    parentModel = GridFactory.getGridFromLocation(parentResource, parentGrid, entityModelReader, dispatchContext);

+                } catch (Exception e) {

+                    Debug.logError(e, "Failed to load parent grid definition '" + parentGrid + "' at resource '" + parentResource

+                            + "'", module);

+                }

+            } else if (!parentGrid.equals(gridElement.getAttribute("name"))) {

+                // try to find a grid definition in the same file

+                Element rootElement = gridElement.getOwnerDocument().getDocumentElement();

+                List<? extends Element> gridElements = UtilXml.childElementList(rootElement, "grid");

+                if (gridElements.isEmpty()) {

+                    // Backwards compatibility - look for form definitions

+                    gridElements = UtilXml.childElementList(rootElement, "form");

+                }

+                for (Element parentElement : gridElements) {

+                    if (parentElement.getAttribute("name").equals(parentGrid) && gridType.equals(parentElement.getAttribute("type"))) {

+                        parentModel = GridFactory.createModelGrid(parentElement, entityModelReader, dispatchContext, parentResource, parentGrid);

+                        break;

+                    }

+                }

+                if (parentModel == null) {

+                    Debug.logError("Failed to find parent grid definition '" + parentGrid + "' in same document.", module);

+                }

+            } else {

+                Debug.logError("Recursive grid definition found for '" + gridElement.getAttribute("name") + ".'", module);

+            }

+        }

+        return parentModel;

+    }

+

+    public String getPassedRowCount(Map<String, Object> context) {

+        return rowCountExdr.expandString(context);

+    }

+

+    public List<ModelAction> getRowActions() {

+        return rowActions;

+    }

+

+    public String getRowCount() {

+        return rowCountExdr.getOriginal();

+    }

+

+    public boolean getSeparateColumns() {

+        return this.separateColumns;

+    }

+

+    public boolean getSkipEnd() {

+        return this.skipEnd;

+    }

+

+    public boolean getSkipStart() {

+        return this.skipStart;

+    }

+

+    public String getSortField(Map<String, Object> context) {

+        String value = null;

+        try {

+            value = (String) context.get(this.sortFieldParameterName);

+            if (value == null) {

+                Map<String, String> parameters = UtilGenerics.cast(context.get("parameters"));

+                if (parameters != null) {

+                    value = parameters.get(this.sortFieldParameterName);

+                }

+            }

+        } catch (Exception e) {

+            Debug.logWarning(e, "Error getting sortField: " + e.toString(), module);

+        }

+        return value;

+    }

+

+    public String getSortFieldParameterName() {

+        return this.sortFieldParameterName;

+    }

+

+    public List<SortField> getSortOrderFields() {

+        return sortOrderFields;

+    }

+

+    /**

+     * iterate through alt-row-styles list to see if should be used, then add style

+     * @return The style for item row

+     */

+    public String getStyleAltRowStyle(Map<String, Object> context) {

+        String styles = "";

+        try {

+            // use the same Interpreter (ie with the same context setup) for all evals

+            Interpreter bsh = this.getBshInterpreter(context);

+            for (AltRowStyle altRowStyle : this.altRowStyles) {

+                Object retVal = bsh.eval(StringUtil.convertOperatorSubstitutions(altRowStyle.useWhen));

+                // retVal should be a Boolean, if not something weird is up...

+                if (retVal instanceof Boolean) {

+                    Boolean boolVal = (Boolean) retVal;

+                    if (boolVal.booleanValue()) {

+                        styles += altRowStyle.style;

+                    }

+                } else {

+                    throw new IllegalArgumentException("Return value from style condition eval was not a Boolean: "

+                            + retVal.getClass().getName() + " [" + retVal + "] of form " + getName());

+                }

+            }

+        } catch (EvalError e) {

+            String errmsg = "Error evaluating BeanShell style conditions on form " + getName();

+            Debug.logError(e, errmsg, module);

+            throw new IllegalArgumentException(errmsg);

+        }

+        return styles;

+    }

+

+    public String getTarget() {

+        return target.getOriginal();

+    }

+

+    /** iterate through altTargets list to see if any should be used, if not return original target

+     * @return The target for this Form

+     */

+    public String getTarget(Map<String, Object> context, String targetType) {

+        Map<String, Object> expanderContext = context;

+        UtilCodec.SimpleEncoder simpleEncoder = (UtilCodec.SimpleEncoder) context.get("simpleEncoder");

+        if (simpleEncoder != null) {

+            expanderContext = UtilCodec.HtmlEncodingMapWrapper.getHtmlEncodingMapWrapper(context, simpleEncoder);

+        }

+        try {

+            // use the same Interpreter (ie with the same context setup) for all evals

+            Interpreter bsh = this.getBshInterpreter(context);

+            for (AltTarget altTarget : this.altTargets) {

+                String useWhen = FlexibleStringExpander.expandString(altTarget.useWhen, context);

+                Object retVal = bsh.eval(StringUtil.convertOperatorSubstitutions(useWhen));

+                boolean condTrue = false;

+                // retVal should be a Boolean, if not something weird is up...

+                if (retVal instanceof Boolean) {

+                    Boolean boolVal = (Boolean) retVal;

+                    condTrue = boolVal.booleanValue();

+                } else {

+                    throw new IllegalArgumentException("Return value from target condition eval was not a Boolean: "

+                            + retVal.getClass().getName() + " [" + retVal + "] of form " + getName());

+                }

+

+                if (condTrue && !targetType.equals("inter-app")) {

+                    return altTarget.targetExdr.expandString(expanderContext);

+                }

+            }

+        } catch (EvalError e) {

+            String errmsg = "Error evaluating BeanShell target conditions on form " + getName();

+            Debug.logError(e, errmsg, module);

+            throw new IllegalArgumentException(errmsg);

+        }

+        return target.expandString(expanderContext);

+    }

+

+    public String getTargetType() {

+        return this.targetType;

+    }

+

+    public String getTargetWindow() {

+        return targetWindowExdr.getOriginal();

+    }

+

+    public String getTargetWindow(Map<String, Object> context) {

+        return this.targetWindowExdr.expandString(context);

+    }

+

+    public String getTitle() {

+        return this.title;

+    }

+

+    public String getTooltip() {

+        return this.tooltip;

+    }

+

+    public String getType() {

+        return this.type;

+    }

+

+    public boolean getUseRowSubmit() {

+        return this.useRowSubmit;

+    }

+

+    public Set<String> getUseWhenFields() {

+        return useWhenFields;

+    }

+    public boolean getGroupColumns() {

+        return groupColumns;

+    }

+

+    public boolean isOverridenListSize() {

+        return !this.overrideListSize.isEmpty();

+    }

+

+    public void runFormActions(Map<String, Object> context) {

+        AbstractModelAction.runSubActions(this.actions, context);

+    }

+}

diff --git a/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java b/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java
index 2ee5b5a..e341aa3 100644
--- a/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java
+++ b/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java
@@ -540,7 +540,7 @@
             parameterList.add(new Parameter("parentPortalPageId", portalPage.getString("parentPortalPageId"), false));

             String target = "showPortalPage";

             if (parentMenuItem.link != null) {

-                target= "";

+                target = parentMenuItem.link.getTargetExdr().getOriginal();

             }

             this.link = new Link(portalPage, parameterList, target, locale);

         }

diff --git a/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java b/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java
index f5d1949..544a298 100644
--- a/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java
+++ b/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java
@@ -1046,9 +1046,9 @@
                 }

                 UtilGenerics.<MapStack<String>>cast(context).push();

             }

-            ModelForm modelForm = getModelForm(context);

-            FormRenderer renderer = new FormRenderer(modelForm, formStringRenderer);

             try {

+                ModelForm modelForm = getModelForm(context);

+                FormRenderer renderer = new FormRenderer(modelForm, formStringRenderer);

                 renderer.render(writer, context);

             } catch (Exception e) {

                 String errMsg = "Error rendering included form named [" + getName() + "] at location [" + this.getLocation(context) + "]: " + e.toString();

@@ -1061,12 +1061,97 @@
             }

         }

 

+        public ModelForm getModelForm(Map<String, Object> context) throws IOException, SAXException, ParserConfigurationException {

+            String name = this.getName(context);

+            String location = this.getLocation(context);

+            return FormFactory.getFormFromLocation(location, name, getModelScreen().getDelegator(context).getModelReader(),

+                    getModelScreen().getDispatcher(context).getDispatchContext());

+        }

+

+        public String getName(Map<String, Object> context) {

+            return this.nameExdr.expandString(context);

+        }

+

+        public String getLocation() {

+            return locationExdr.getOriginal();

+        }

+

+        public String getLocation(Map<String, Object> context) {

+            return this.locationExdr.expandString(context);

+        }

+

+        public boolean shareScope(Map<String, Object> context) {

+            String shareScopeString = this.shareScopeExdr.expandString(context);

+            // defaults to false, so anything but true is false

+            return "true".equals(shareScopeString);

+        }

+

+        @Override

+        public void accept(ModelWidgetVisitor visitor) throws Exception {

+            visitor.visit(this);

+        }

+

+        public FlexibleStringExpander getNameExdr() {

+            return nameExdr;

+        }

+

+        public FlexibleStringExpander getLocationExdr() {

+            return locationExdr;

+        }

+

+        public FlexibleStringExpander getShareScopeExdr() {

+            return shareScopeExdr;

+        }

+    }

+

+    public static final class Grid extends ModelScreenWidget {

+        public static final String TAG_NAME = "include-grid";

+        private final FlexibleStringExpander nameExdr;

+        private final FlexibleStringExpander locationExdr;

+        private final FlexibleStringExpander shareScopeExdr;

+

+        public Grid(ModelScreen modelScreen, Element formElement) {

+            super(modelScreen, formElement);

+            this.nameExdr = FlexibleStringExpander.getInstance(formElement.getAttribute("name"));

+            this.locationExdr = FlexibleStringExpander.getInstance(formElement.getAttribute("location"));

+            this.shareScopeExdr = FlexibleStringExpander.getInstance(formElement.getAttribute("share-scope"));

+        }

+

+        @Override

+        public void renderWidgetString(Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer) {

+            // Output format might not support forms, so make form rendering optional.

+            FormStringRenderer formStringRenderer = (FormStringRenderer) context.get("formStringRenderer");

+            if (formStringRenderer == null) {

+                Debug.logVerbose("FormStringRenderer instance not found in rendering context, form not rendered.", module);

+                return;

+            }

+            boolean protectScope = !shareScope(context);

+            if (protectScope) {

+                if (!(context instanceof MapStack<?>)) {

+                    context = MapStack.create(context);

+                }

+                UtilGenerics.<MapStack<String>>cast(context).push();

+            }

+            ModelForm modelForm = getModelForm(context);

+            FormRenderer renderer = new FormRenderer(modelForm, formStringRenderer);

+            try {

+                renderer.render(writer, context);

+            } catch (Exception e) {

+                String errMsg = "Error rendering included grid named [" + getName() + "] at location [" + this.getLocation(context) + "]: " + e.toString();

+                Debug.logError(e, errMsg, module);

+                throw new RuntimeException(errMsg + e);

+            }

+            if (protectScope) {

+                UtilGenerics.<MapStack<String>>cast(context).pop();

+            }

+        }

+

         public ModelForm getModelForm(Map<String, Object> context) {

             ModelForm modelForm = null;

             String name = this.getName(context);

             String location = this.getLocation(context);

             try {

-                modelForm = FormFactory.getFormFromLocation(location, name, getModelScreen().getDelegator(context).getModelReader(), getModelScreen().getDispatcher(context).getDispatchContext());

+                modelForm = GridFactory.getGridFromLocation(location, name, getModelScreen().getDelegator(context).getModelReader(), getModelScreen().getDispatcher(context).getDispatchContext());

             } catch (Exception e) {

                 String errMsg = "Error rendering included form named [" + name + "] at location [" + location + "]: ";

                 Debug.logError(e, errMsg, module);

@@ -1109,7 +1194,6 @@
         public FlexibleStringExpander getShareScopeExdr() {

             return shareScopeExdr;

         }

-

     }

 

     public static final class Tree extends ModelScreenWidget {

diff --git a/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java b/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java
new file mode 100644
index 0000000..6e06eed
--- /dev/null
+++ b/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java
@@ -0,0 +1,654 @@
+/*******************************************************************************

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ * http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ *******************************************************************************/

+package org.ofbiz.widget.model;

+

+import java.util.List;

+import java.util.Locale;

+import java.util.Map;

+import java.util.Set;

+

+import org.ofbiz.base.util.BshUtil;

+import org.ofbiz.base.util.Debug;

+import org.ofbiz.base.util.StringUtil;

+import org.ofbiz.base.util.UtilCodec;

+import org.ofbiz.base.util.UtilGenerics;

+import org.ofbiz.base.util.UtilProperties;

+import org.ofbiz.base.util.UtilValidate;

+import org.ofbiz.base.util.UtilXml;

+import org.ofbiz.base.util.string.FlexibleStringExpander;

+import org.ofbiz.entity.model.ModelReader;

+import org.ofbiz.service.DispatchContext;

+import org.ofbiz.widget.WidgetWorker;

+import org.w3c.dom.Element;

+

+import bsh.EvalError;

+import bsh.Interpreter;

+

+/**

+ * Models the &lt;form&gt; element.

+ * 

+ * @see <code>widget-form.xsd</code>

+ */

+@SuppressWarnings("serial")

+public class ModelSingleForm extends ModelForm {

+

+    /*

+     * ----------------------------------------------------------------------- *

+     *                     DEVELOPERS PLEASE READ

+     * ----------------------------------------------------------------------- *

+     * 

+     * This model is intended to be a read-only data structure that represents

+     * an XML element. Outside of object construction, the class should not

+     * have any behaviors. All behavior should be contained in model visitors.

+     * 

+     * Instances of this class will be shared by multiple threads - therefore

+     * it is immutable. DO NOT CHANGE THE OBJECT'S STATE AT RUN TIME!

+     * 

+     * BE VERY CAREFUL when implementing "extends" - parent form collections

+     * must be added to child collections, not replace them. In other words,

+     * do not assign parent collection fields to child collection fields.

+     * 

+     */

+

+    public static final String module = ModelSingleForm.class.getName();

+

+    /** XML Constructor */

+    public ModelSingleForm(Element formElement, String formLocation, ModelReader entityModelReader, DispatchContext dispatchContext) {

+        super(formElement, formLocation, entityModelReader, dispatchContext);

+    }

+

+    @Override

+    public void accept(ModelWidgetVisitor visitor) throws Exception {

+        visitor.visit(this);

+    }

+    public List<ModelAction> getActions() {

+        return actions;

+    }

+

+    public List<AltRowStyle> getAltRowStyles() {

+        return altRowStyles;

+    }

+

+    public List<AltTarget> getAltTargets() {

+        return altTargets;

+    }

+

+    public List<AutoFieldsEntity> getAutoFieldsEntities() {

+        return autoFieldsEntities;

+    }

+

+    public List<AutoFieldsService> getAutoFieldsServices() {

+        return autoFieldsServices;

+    }

+

+    public Interpreter getBshInterpreter(Map<String, Object> context) throws EvalError {

+        Interpreter bsh = (Interpreter) context.get("bshInterpreter");

+        if (bsh == null) {

+            bsh = BshUtil.makeInterpreter(context);

+            context.put("bshInterpreter", bsh);

+        }

+        return bsh;

+    }

+

+    @Override

+    public String getBoundaryCommentName() {

+        return formLocation + "#" + getName();

+    }

+

+    public boolean getClientAutocompleteFields() {

+        return this.clientAutocompleteFields;

+    }

+

+    public String getContainerId() {

+        // use the name if there is no id

+        if (UtilValidate.isNotEmpty(this.containerId)) {

+            return this.containerId;

+        } else {

+            return this.getName();

+        }

+    }

+

+    public String getContainerStyle() {

+        return this.containerStyle;

+    }

+

+    public String getDefaultEntityName() {

+        return this.defaultEntityName;

+    }

+

+    public FieldGroup getDefaultFieldGroup() {

+        return defaultFieldGroup;

+    }

+

+    public Map<String, ? extends Object> getDefaultMap(Map<String, ? extends Object> context) {

+        return this.defaultMapName.get(context);

+    }

+

+    public String getDefaultMapName() {

+        return this.defaultMapName.getOriginalName();

+    }

+

+    public String getDefaultRequiredFieldStyle() {

+        return this.defaultRequiredFieldStyle;

+    }

+

+    public String getDefaultServiceName() {

+        return this.defaultServiceName;

+    }

+

+    public String getDefaultSortFieldAscStyle() {

+        return this.defaultSortFieldAscStyle;

+    }

+

+    public String getDefaultSortFieldDescStyle() {

+        return this.defaultSortFieldDescStyle;

+    }

+

+    public String getDefaultSortFieldStyle() {

+        return this.defaultSortFieldStyle;

+    }

+

+    public String getDefaultTableStyle() {

+        return this.defaultTableStyle;

+    }

+

+    public String getDefaultTitleAreaStyle() {

+        return this.defaultTitleAreaStyle;

+    }

+

+    public String getDefaultTitleStyle() {

+        return this.defaultTitleStyle;

+    }

+

+    public String getDefaultTooltipStyle() {

+        return this.defaultTooltipStyle;

+    }

+

+    public int getDefaultViewSize() {

+        return defaultViewSize;

+    }

+

+    public String getDefaultWidgetAreaStyle() {

+        return this.defaultWidgetAreaStyle;

+    }

+

+    public String getDefaultWidgetStyle() {

+        return this.defaultWidgetStyle;

+    }

+

+    public String getEvenRowStyle() {

+        return this.evenRowStyle;

+    }

+

+    public List<FieldGroupBase> getFieldGroupList() {

+        return fieldGroupList;

+    }

+

+    public Map<String, FieldGroupBase> getFieldGroupMap() {

+        return fieldGroupMap;

+    }

+

+    public List<ModelFormField> getFieldList() {

+        return fieldList;

+    }

+

+    public String getFocusFieldName() {

+        return focusFieldName;

+    }

+

+    public String getFormLocation() {

+        return this.formLocation;

+    }

+

+    public String getFormTitleAreaStyle() {

+        return this.formTitleAreaStyle;

+    }

+

+    public String getFormWidgetAreaStyle() {

+        return this.formWidgetAreaStyle;

+    }

+

+    public String getHeaderRowStyle() {

+        return this.headerRowStyle;

+    }

+

+    public boolean getHideHeader() {

+        return this.hideHeader;

+    }

+

+    public String getItemIndexSeparator() {

+        if (UtilValidate.isNotEmpty(this.itemIndexSeparator)) {

+            return this.itemIndexSeparator;

+        } else {

+            return "_o_";

+        }

+    }

+

+    public List<String> getLastOrderFields() {

+        return lastOrderFields;

+    }

+

+    public String getListEntryName() {

+        return this.listEntryName;

+    }

+

+    public String getListName() {

+        return this.listName;

+    }

+

+    public String getMultiPaginateIndexField(Map<String, Object> context) {

+        String field = this.paginateIndexField.expandString(context);

+        if (UtilValidate.isEmpty(field)) {

+            field = DEFAULT_PAG_INDEX_FIELD;

+        }

+        //  append the paginator number

+        field = field + "_" + WidgetWorker.getPaginatorNumber(context);

+        return field;

+    }

+

+    public String getMultiPaginateSizeField(Map<String, Object> context) {

+        String field = this.paginateSizeField.expandString(context);

+        if (UtilValidate.isEmpty(field)) {

+            field = DEFAULT_PAG_SIZE_FIELD;

+        }

+        //  append the paginator number

+        field = field + "_" + WidgetWorker.getPaginatorNumber(context);

+        return field;

+    }

+

+    public List<ModelFormField> getMultiSubmitFields() {

+        return this.multiSubmitFields;

+    }

+

+    public String getOddRowStyle() {

+        return this.oddRowStyle;

+    }

+

+    public List<UpdateArea> getOnPaginateUpdateAreas() {

+        return this.onPaginateUpdateAreas;

+    }

+

+    public List<UpdateArea> getOnSortColumnUpdateAreas() {

+        return this.onSortColumnUpdateAreas;

+    }

+

+    /* Returns the list of ModelForm.UpdateArea objects.

+     */

+    public List<UpdateArea> getOnSubmitUpdateAreas() {

+        return this.onSubmitUpdateAreas;

+    }

+

+    public String getOverrideListSize() {

+        return overrideListSize.getOriginal();

+    }

+

+    public int getOverrideListSize(Map<String, Object> context) {

+        int listSize = 0;

+        if (!this.overrideListSize.isEmpty()) {

+            String size = this.overrideListSize.expandString(context);

+            try {

+                size = size.replaceAll("[^0-9.]", "");

+                listSize = Integer.parseInt(size);

+            } catch (NumberFormatException e) {

+                Debug.logError(e, "Error getting override list size from value " + size, module);

+            }

+        }

+        return listSize;

+    }

+

+    public String getPaginate() {

+        return paginate.getOriginal();

+    }

+

+    public boolean getPaginate(Map<String, Object> context) {

+        String paginate = this.paginate.expandString(context);

+        if (!paginate.isEmpty()) {

+            return Boolean.valueOf(paginate).booleanValue();

+        } else {

+            return true;

+        }

+    }

+

+    public String getPaginateFirstLabel() {

+        return paginateFirstLabel.getOriginal();

+    }

+

+    public String getPaginateFirstLabel(Map<String, Object> context) {

+        Locale locale = (Locale) context.get("locale");

+        String field = this.paginateFirstLabel.expandString(context);

+        if (UtilValidate.isEmpty(field)) {

+            field = UtilProperties.getMessage("CommonUiLabels", "CommonFirst", locale);

+        }

+        return field;

+    }

+

+    public String getPaginateFirstStyle() {

+        return DEFAULT_PAG_FIRST_STYLE;

+    }

+

+    public String getPaginateIndexField() {

+        return paginateIndexField.getOriginal();

+    }

+

+    public String getPaginateIndexField(Map<String, Object> context) {

+        String field = this.paginateIndexField.expandString(context);

+        if (field.isEmpty()) {

+            return DEFAULT_PAG_INDEX_FIELD;

+        }

+        return field;

+    }

+

+    public String getPaginateLastLabel() {

+        return paginateLastLabel.getOriginal();

+    }

+

+    public String getPaginateLastLabel(Map<String, Object> context) {

+        Locale locale = (Locale) context.get("locale");

+        String field = this.paginateLastLabel.expandString(context);

+        if (UtilValidate.isEmpty(field)) {

+            field = UtilProperties.getMessage("CommonUiLabels", "CommonLast", locale);

+        }

+        return field;

+    }

+

+    public String getPaginateLastStyle() {

+        return DEFAULT_PAG_LAST_STYLE;

+    }

+

+    public String getPaginateNextLabel() {

+        return paginateNextLabel.getOriginal();

+    }

+

+    public String getPaginateNextLabel(Map<String, Object> context) {

+        String field = this.paginateNextLabel.expandString(context);

+        if (field.isEmpty()) {

+            Locale locale = (Locale) context.get("locale");

+            return UtilProperties.getMessage("CommonUiLabels", "CommonNext", locale);

+        }

+        return field;

+    }

+

+    public String getPaginateNextStyle() {

+        return DEFAULT_PAG_NEXT_STYLE;

+    }

+

+    public String getPaginatePreviousLabel() {

+        return paginatePreviousLabel.getOriginal();

+    }

+

+    public String getPaginatePreviousLabel(Map<String, Object> context) {

+        String field = this.paginatePreviousLabel.expandString(context);

+        if (field.isEmpty()) {

+            Locale locale = (Locale) context.get("locale");

+            field = UtilProperties.getMessage("CommonUiLabels", "CommonPrevious", locale);

+        }

+        return field;

+    }

+

+    public String getPaginatePreviousStyle() {

+        return DEFAULT_PAG_PREV_STYLE;

+    }

+

+    public String getPaginateSizeField() {

+        return paginateSizeField.getOriginal();

+    }

+

+    public String getPaginateSizeField(Map<String, Object> context) {

+        String field = this.paginateSizeField.expandString(context);

+        if (field.isEmpty()) {

+            return DEFAULT_PAG_SIZE_FIELD;

+        }

+        return field;

+    }

+

+    public String getPaginateStyle() {

+        return this.paginateStyle;

+    }

+

+    public String getPaginateTarget() {

+        return paginateTarget.getOriginal();

+    }

+

+    public String getPaginateTarget(Map<String, Object> context) {

+        String targ = this.paginateTarget.expandString(context);

+        if (targ.isEmpty()) {

+            Map<String, ?> parameters = UtilGenerics.cast(context.get("parameters"));

+            if (parameters != null && parameters.containsKey("targetRequestUri")) {

+                targ = (String) parameters.get("targetRequestUri");

+            }

+        }

+        return targ;

+    }

+

+    public String getPaginateTargetAnchor() {

+        return this.paginateTargetAnchor;

+    }

+

+    public String getPaginateViewSizeLabel() {

+        return paginateViewSizeLabel.getOriginal();

+    }

+

+    public String getPaginateViewSizeLabel(Map<String, Object> context) {

+        String field = this.paginateViewSizeLabel.expandString(context);

+        if (field.isEmpty()) {

+            Locale locale = (Locale) context.get("locale");

+            return UtilProperties.getMessage("CommonUiLabels", "CommonItemsPerPage", locale);

+        }

+        return field;

+    }

+

+    protected ModelForm getParentModel(Element formElement, ModelReader entityModelReader, DispatchContext dispatchContext) {

+        ModelForm parent = null;

+        String parentResource = formElement.getAttribute("extends-resource");

+        String parentForm = formElement.getAttribute("extends");

+        String formType = formElement.getAttribute("type");

+        if (!parentForm.isEmpty()) {

+            // check if we have a resource name

+            if (!parentResource.isEmpty()) {

+                try {

+                    parent = FormFactory.getFormFromLocation(parentResource, parentForm, entityModelReader, dispatchContext);

+                } catch (Exception e) {

+                    Debug.logError(e, "Failed to load parent form definition '" + parentForm + "' at resource '" + parentResource

+                            + "'", module);

+                }

+            } else if (!parentForm.equals(formElement.getAttribute("name"))) {

+                // try to find a form definition in the same file

+                Element rootElement = formElement.getOwnerDocument().getDocumentElement();

+                List<? extends Element> formElements = UtilXml.childElementList(rootElement, "form");

+                //Uncomment below to add support for abstract forms

+                //formElements.addAll(UtilXml.childElementList(rootElement, "abstract-form"));

+                for (Element parentElement : formElements) {

+                    if (parentElement.getAttribute("name").equals(parentForm) && formType.equals(parentElement.getAttribute("type"))) {

+                        parent = FormFactory.createModelForm(parentElement, entityModelReader, dispatchContext, parentResource,

+                                parentForm);

+                        break;

+                    }

+                }

+                if (parent == null) {

+                    Debug.logError("Failed to find parent form definition '" + parentForm + "' in same document.", module);

+                }

+            } else {

+                Debug.logError("Recursive form definition found for '" + formElement.getAttribute("name") + ".'", module);

+            }

+        }

+        return parent;

+    }

+

+    public String getPassedRowCount(Map<String, Object> context) {

+        return rowCountExdr.expandString(context);

+    }

+

+    public List<ModelAction> getRowActions() {

+        return rowActions;

+    }

+

+    public String getRowCount() {

+        return rowCountExdr.getOriginal();

+    }

+

+    public boolean getSeparateColumns() {

+        return this.separateColumns;

+    }

+

+    public boolean getSkipEnd() {

+        return this.skipEnd;

+    }

+

+    public boolean getSkipStart() {

+        return this.skipStart;

+    }

+

+    public String getSortField(Map<String, Object> context) {

+        String value = null;

+        try {

+            value = (String) context.get(this.sortFieldParameterName);

+            if (value == null) {

+                Map<String, String> parameters = UtilGenerics.cast(context.get("parameters"));

+                if (parameters != null) {

+                    value = parameters.get(this.sortFieldParameterName);

+                }

+            }

+        } catch (Exception e) {

+            Debug.logWarning(e, "Error getting sortField: " + e.toString(), module);

+        }

+        return value;

+    }

+

+    public String getSortFieldParameterName() {

+        return this.sortFieldParameterName;

+    }

+

+    public List<SortField> getSortOrderFields() {

+        return sortOrderFields;

+    }

+

+    /**

+     * iterate through alt-row-styles list to see if should be used, then add style

+     * @return The style for item row

+     */

+    public String getStyleAltRowStyle(Map<String, Object> context) {

+        String styles = "";

+        try {

+            // use the same Interpreter (ie with the same context setup) for all evals

+            Interpreter bsh = this.getBshInterpreter(context);

+            for (AltRowStyle altRowStyle : this.altRowStyles) {

+                Object retVal = bsh.eval(StringUtil.convertOperatorSubstitutions(altRowStyle.useWhen));

+                // retVal should be a Boolean, if not something weird is up...

+                if (retVal instanceof Boolean) {

+                    Boolean boolVal = (Boolean) retVal;

+                    if (boolVal.booleanValue()) {

+                        styles += altRowStyle.style;

+                    }

+                } else {

+                    throw new IllegalArgumentException("Return value from style condition eval was not a Boolean: "

+                            + retVal.getClass().getName() + " [" + retVal + "] of form " + getName());

+                }

+            }

+        } catch (EvalError e) {

+            String errmsg = "Error evaluating BeanShell style conditions on form " + getName();

+            Debug.logError(e, errmsg, module);

+            throw new IllegalArgumentException(errmsg);

+        }

+        return styles;

+    }

+

+    public String getTarget() {

+        return target.getOriginal();

+    }

+

+    /** iterate through altTargets list to see if any should be used, if not return original target

+     * @return The target for this Form

+     */

+    public String getTarget(Map<String, Object> context, String targetType) {

+        Map<String, Object> expanderContext = context;

+        UtilCodec.SimpleEncoder simpleEncoder = (UtilCodec.SimpleEncoder) context.get("simpleEncoder");

+        if (simpleEncoder != null) {

+            expanderContext = UtilCodec.HtmlEncodingMapWrapper.getHtmlEncodingMapWrapper(context, simpleEncoder);

+        }

+        try {

+            // use the same Interpreter (ie with the same context setup) for all evals

+            Interpreter bsh = this.getBshInterpreter(context);

+            for (AltTarget altTarget : this.altTargets) {

+                String useWhen = FlexibleStringExpander.expandString(altTarget.useWhen, context);

+                Object retVal = bsh.eval(StringUtil.convertOperatorSubstitutions(useWhen));

+                boolean condTrue = false;

+                // retVal should be a Boolean, if not something weird is up...

+                if (retVal instanceof Boolean) {

+                    Boolean boolVal = (Boolean) retVal;

+                    condTrue = boolVal.booleanValue();

+                } else {

+                    throw new IllegalArgumentException("Return value from target condition eval was not a Boolean: "

+                            + retVal.getClass().getName() + " [" + retVal + "] of form " + getName());

+                }

+

+                if (condTrue && !targetType.equals("inter-app")) {

+                    return altTarget.targetExdr.expandString(expanderContext);

+                }

+            }

+        } catch (EvalError e) {

+            String errmsg = "Error evaluating BeanShell target conditions on form " + getName();

+            Debug.logError(e, errmsg, module);

+            throw new IllegalArgumentException(errmsg);

+        }

+        return target.expandString(expanderContext);

+    }

+

+    public String getTargetType() {

+        return this.targetType;

+    }

+

+    public String getTargetWindow() {

+        return targetWindowExdr.getOriginal();

+    }

+

+    public String getTargetWindow(Map<String, Object> context) {

+        return this.targetWindowExdr.expandString(context);

+    }

+

+    public String getTitle() {

+        return this.title;

+    }

+

+    public String getTooltip() {

+        return this.tooltip;

+    }

+

+    public String getType() {

+        return this.type;

+    }

+

+    public boolean getUseRowSubmit() {

+        return this.useRowSubmit;

+    }

+

+    public Set<String> getUseWhenFields() {

+        return useWhenFields;

+    }

+    public boolean getGroupColumns() {

+        return groupColumns;

+    }

+

+    public boolean isOverridenListSize() {

+        return !this.overrideListSize.isEmpty();

+    }

+

+    public void runFormActions(Map<String, Object> context) {

+        AbstractModelAction.runSubActions(this.actions, context);

+    }

+}

diff --git a/framework/widget/src/org/ofbiz/widget/model/ModelWidgetVisitor.java b/framework/widget/src/org/ofbiz/widget/model/ModelWidgetVisitor.java
index 50643fa..9728c3f 100644
--- a/framework/widget/src/org/ofbiz/widget/model/ModelWidgetVisitor.java
+++ b/framework/widget/src/org/ofbiz/widget/model/ModelWidgetVisitor.java
@@ -18,7 +18,6 @@
  *******************************************************************************/

 package org.ofbiz.widget.model;

 

-import org.ofbiz.widget.model.HtmlWidget;

 

 /**

  *  A <code>ModelWidget</code> visitor.

@@ -35,7 +34,9 @@
 

     void visit(IterateSectionWidget iterateSectionWidget) throws Exception;

 

-    void visit(ModelForm modelForm) throws Exception;

+    void visit(ModelSingleForm modelForm) throws Exception;

+

+    void visit(ModelGrid modelGrid) throws Exception;

 

     void visit(ModelMenu modelMenu) throws Exception;

 

@@ -57,6 +58,8 @@
 

     void visit(ModelScreenWidget.Form form) throws Exception;

 

+    void visit(ModelScreenWidget.Grid grid) throws Exception;

+

     void visit(ModelScreenWidget.HorizontalSeparator horizontalSeparator) throws Exception;

 

     void visit(ModelScreenWidget.ScreenImage image) throws Exception;

diff --git a/framework/widget/src/org/ofbiz/widget/model/XmlWidgetVisitor.java b/framework/widget/src/org/ofbiz/widget/model/XmlWidgetVisitor.java
index 129eb26..049d996 100644
--- a/framework/widget/src/org/ofbiz/widget/model/XmlWidgetVisitor.java
+++ b/framework/widget/src/org/ofbiz/widget/model/XmlWidgetVisitor.java
@@ -32,6 +32,7 @@
 import org.ofbiz.widget.model.ModelScreenWidget.DecoratorSection;

 import org.ofbiz.widget.model.ModelScreenWidget.DecoratorSectionInclude;

 import org.ofbiz.widget.model.ModelScreenWidget.Form;

+import org.ofbiz.widget.model.ModelScreenWidget.Grid;

 import org.ofbiz.widget.model.ModelScreenWidget.HorizontalSeparator;

 import org.ofbiz.widget.model.ModelScreenWidget.IncludeScreen;

 import org.ofbiz.widget.model.ModelScreenWidget.Label;

@@ -236,7 +237,7 @@
     }

 

     @Override

-    public void visit(ModelForm modelForm) throws Exception {

+    public void visit(ModelSingleForm modelForm) throws Exception {

         writer.append("<form");

         visitModelWidget(modelForm);

         if (modelForm.getParentModelForm() != null) {

@@ -344,6 +345,21 @@
     }

 

     @Override

+    public void visit(ModelGrid modelGrid) throws Exception {

+        // TODO: Finish implementation

+        

+    }

+

+    @Override

+    public void visit(Grid grid) throws Exception {

+        writer.append("<include-grid");

+        visitModelWidget(grid);

+        visitAttribute("location", grid.getLocationExdr());

+        visitAttribute("share-scope", grid.getShareScopeExdr());

+        writer.append("/>");

+    }

+

+    @Override

     public void visit(ModelMenu modelMenu) throws Exception {

         writer.append("<menu");

         visitModelWidget(modelMenu);

diff --git a/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java b/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java
index f257c78..636fa13 100644
--- a/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java
+++ b/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java
@@ -44,7 +44,7 @@
 import org.ofbiz.widget.WidgetWorker;

 import org.ofbiz.widget.model.AbstractModelAction;

 import org.ofbiz.widget.model.FieldInfo;

-import org.ofbiz.widget.model.ModelForm;

+import org.ofbiz.widget.model.*;

 import org.ofbiz.widget.model.ModelForm.FieldGroup;

 import org.ofbiz.widget.model.ModelForm.FieldGroupBase;

 import org.ofbiz.widget.model.ModelFormField;

@@ -214,7 +214,7 @@
     }

 

     /**

-     * Renders this form to a String, i.e. in a text format, as defined with the

+     * Renders this form to a writer, as defined with the

      * FormStringRenderer implementation.

      *

      * @param writer The Writer that the form text will be written to

@@ -227,7 +227,7 @@
     public void render(Appendable writer, Map<String, Object> context)

             throws Exception {

         //  increment the paginator, only for list and multi forms

-        if ("list".equals(modelForm.getType()) || "multi".equals(modelForm.getType())) {

+        if (modelForm instanceof ModelGrid) {

             WidgetWorker.incrementPaginatorNumber(context);

         }

 

@@ -237,8 +237,8 @@
 

         modelForm.runFormActions(context);

 

-        // if this is a list form, don't useRequestParameters

-        if ("list".equals(modelForm.getType()) || "multi".equals(modelForm.getType())) {

+        // if this is a list form, don't use Request Parameters

+        if (modelForm instanceof ModelGrid) {

             context.put("useRequestParameters", Boolean.FALSE);

         }

 

diff --git a/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java b/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java
index 9f64859..d46172a 100644
--- a/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java
+++ b/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java
@@ -25,7 +25,7 @@
 import org.ofbiz.widget.model.ModelFormField;

 

 /**

- * Widget Library - Form String Renderer interface.

+ * Widget Library - Form/Grid renderer.

  */

 public interface FormStringRenderer {

     public void renderDisplayField(Appendable writer, Map<String, Object> context, ModelFormField.DisplayField displayField) throws IOException;

diff --git a/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java b/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java
index 04a81cb..a7be400 100644
--- a/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java
+++ b/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java
@@ -28,6 +28,7 @@
 import javax.servlet.ServletContext;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

+import javax.xml.parsers.ParserConfigurationException;

 

 import org.ofbiz.base.util.Debug;

 import org.ofbiz.base.util.GeneralException;

@@ -65,6 +66,7 @@
 import org.ofbiz.widget.renderer.MenuStringRenderer;

 import org.ofbiz.widget.renderer.Paginator;

 import org.ofbiz.widget.renderer.ScreenStringRenderer;

+import org.xml.sax.SAXException;

 

 /**

  * Widget Library - HTML Form Renderer implementation

@@ -290,7 +292,12 @@
     protected void renderScreenletPaginateMenu(Appendable writer, Map<String, Object> context, Form form) throws IOException {

         HttpServletResponse response = (HttpServletResponse) context.get("response");

         HttpServletRequest request = (HttpServletRequest) context.get("request");

-        ModelForm modelForm = form.getModelForm(context);

+        ModelForm modelForm;

+        try {

+            modelForm = form.getModelForm(context);

+        } catch (Exception e) {

+            throw new IOException(e);

+        }

         modelForm.runFormActions(context);

         Paginator.preparePager(modelForm, context);

         String targetService = modelForm.getPaginateTarget(context);

diff --git a/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java b/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
index a369bea..c97a02b 100644
--- a/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
+++ b/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
@@ -81,6 +81,7 @@
 import org.ofbiz.widget.model.ModelFormField.TextareaField;

 import org.ofbiz.widget.model.ModelFormFieldBuilder;

 import org.ofbiz.widget.model.ModelScreenWidget;

+import org.ofbiz.widget.model.ModelSingleForm;

 import org.ofbiz.widget.model.ModelWidget;

 import org.ofbiz.widget.renderer.FormRenderer;

 import org.ofbiz.widget.renderer.FormStringRenderer;

@@ -157,12 +158,6 @@
         return environment;

     }

 

-    private void appendWhitespace(Appendable writer) throws IOException {

-        // appending line ends for now, but this could be replaced with a simple space or something

-        writer.append("\r\n");

-        //writer.append(' ');

-    }

-

     private String encode(String value, ModelFormField modelFormField, Map<String, Obj