From c293746af5ff9f195bc67b0d9f127f736aba1794 Mon Sep 17 00:00:00 2001 From: Jacques Le Roux Date: Mon, 20 May 2019 17:16:27 +0000 Subject: [PATCH] "Applied fix from trunk for revision: 1859571" ------------------------------------------------------------------------ r1859571 | jleroux | 2019-05-20 19:14:43 +0200 (lun. 20 mai 2019) | 22 lignes Fixed: field emplFromDate is forgot in PayHistory entity (OFBIZ-11028) Arpit Mor: steps to regenerate: Login to the URL: https://demo-trunk.ofbiz.apache.org/humanres/control/main Click on Employments Click on New Employments Click on Create Actual: Error message is displayed. Olivier Heintz: employment is associated with PayHistory, and there is a problem in PayHistory entity definition in OFBiz, In PayHistory, the field fromDate from Employment is confused with fromDate about the current record. A Employment can have multiple PayHistories and should have multiple because PayHistory should show history of Pay for a employment ! It's necessary to have a field emplFromDate (to have the complete employment primaryKey). When modifying a PayRecord the current should be expire and a new one should be created. Thanks: Arpit Mor for report at OFBIZ-10969 and Olivier Heintz for the fix ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859573 13f79535-47bb-0310-9956-ffa450edef68 --- .../entitydef/humanres-entitymodel.xml | 4 +- .../humanres/minilang/HumanResServices.xml | 42 +++++++++- applications/humanres/servicedef/services.xml | 16 +++- .../webapp/humanres/WEB-INF/controller.xml | 5 ++ .../humanres/widget/EmploymentScreens.xml | 22 +++++ .../humanres/widget/HumanresMenus.xml | 13 +-- .../humanres/widget/forms/EmploymentForms.xml | 83 ++++++++++++++----- 7 files changed, 151 insertions(+), 34 deletions(-) diff --git a/applications/datamodel/entitydef/humanres-entitymodel.xml b/applications/datamodel/entitydef/humanres-entitymodel.xml index 4acb09f91d..7a92d91374 100644 --- a/applications/datamodel/entitydef/humanres-entitymodel.xml +++ b/applications/datamodel/entitydef/humanres-entitymodel.xml @@ -526,6 +526,7 @@ under the License. + @@ -537,13 +538,14 @@ under the License. + - + diff --git a/applications/humanres/minilang/HumanResServices.xml b/applications/humanres/minilang/HumanResServices.xml index 83a9303361..4108af4bca 100644 --- a/applications/humanres/minilang/HumanResServices.xml +++ b/applications/humanres/minilang/HumanResServices.xml @@ -22,7 +22,10 @@ xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd"> - + + + + @@ -32,10 +35,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/applications/humanres/servicedef/services.xml b/applications/humanres/servicedef/services.xml index b3a2010b88..08a3f69a4d 100644 --- a/applications/humanres/servicedef/services.xml +++ b/applications/humanres/servicedef/services.xml @@ -154,11 +154,18 @@ under the License. - - Create Employment + + Create Employment and first record in PayHistory + + + + + + @@ -246,11 +253,14 @@ under the License. - + Update Pay History + + diff --git a/applications/humanres/webapp/humanres/WEB-INF/controller.xml b/applications/humanres/webapp/humanres/WEB-INF/controller.xml index 666d8eba94..fb8810c20c 100644 --- a/applications/humanres/webapp/humanres/WEB-INF/controller.xml +++ b/applications/humanres/webapp/humanres/WEB-INF/controller.xml @@ -233,6 +233,10 @@ under the License. + + + + @@ -1146,6 +1150,7 @@ under the License. + diff --git a/applications/humanres/widget/EmploymentScreens.xml b/applications/humanres/widget/EmploymentScreens.xml index 80882afd56..7814065da8 100644 --- a/applications/humanres/widget/EmploymentScreens.xml +++ b/applications/humanres/widget/EmploymentScreens.xml @@ -113,6 +113,28 @@ + +
+ + + + + + + + + + + + + + + + + + +
+
diff --git a/applications/humanres/widget/HumanresMenus.xml b/applications/humanres/widget/HumanresMenus.xml index 89e8d9fd51..df1b580b20 100644 --- a/applications/humanres/widget/HumanresMenus.xml +++ b/applications/humanres/widget/HumanresMenus.xml @@ -36,13 +36,16 @@ + + + - + @@ -51,7 +54,7 @@ - + @@ -60,7 +63,7 @@ - + @@ -69,7 +72,7 @@ - + @@ -78,7 +81,7 @@ - + diff --git a/applications/humanres/widget/forms/EmploymentForms.xml b/applications/humanres/widget/forms/EmploymentForms.xml index 6b385a91c7..0bdb322dd7 100644 --- a/applications/humanres/widget/forms/EmploymentForms.xml +++ b/applications/humanres/widget/forms/EmploymentForms.xml @@ -112,7 +112,7 @@
- + @@ -128,6 +128,19 @@ + + + + + + + + + + + + + @@ -148,43 +161,67 @@ - + + - + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + - - - - - - - - -