svn commit: r1828306 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/workeffort/config/WorkEffortUiLabels.xml applications/workeffort/servicedef/services.xml

Author: jleroux
Date: Wed Apr  4 07:27:56 2018
New Revision: 1828306

URL: http://svn.apache.org/viewvc?rev=1828306&view=rev
Log:
"Applied fix from trunk for revision: 1828255"
------------------------------------------------------------------------
r1828255 | jleroux | 2018-04-03 18:37:09 +0200 (mar., 03 avr. 2018) | 7 lines

Fixed: Required parameters are optional for createWorkRequirementFulfillment service
(OFBIZ-8622)

As per entity def, required parameter should be  requirementId instead of
requirementTypeId.

Thanks: Suraj for the last patch
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/config/WorkEffortUiLabels.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/servicedef/services.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  4 07:27:56 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1828306&r1=1828305&r2=1828306&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/config/WorkEffortUiLabels.xml Wed Apr  4 07:27:56 2018
@@ -5418,8 +5418,8 @@
     <property key="WorkEffortRequiredFieldMissingWorkEffortId">
         <value xml:lang="en">Required Field Missing : WorkEffort Id.</value>
     </property>
-    <property key="WorkEffortRequiredFieldMissingRequirementTypeId">
-        <value xml:lang="en">Required Field Missing : Requirement Type Id.</value>
+    <property key="WorkEffortRequiredFieldMissingRequirementId">
+        <value xml:lang="en">Required Field Missing : Requirement Id.</value>
     </property>
     <property key="WorkEffortRequiredFieldMissingContactMechTypeId">
         <value xml:lang="en">Required Field Missing : ContactMech Type Id.</value>

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/servicedef/services.xml?rev=1828306&r1=1828305&r2=1828306&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/servicedef/services.xml Wed Apr  4 07:27:56 2018
@@ -504,9 +504,9 @@ under the License.
                 <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequiredFieldMissingWorkEffortId"/>
             </type-validate>
         </override>
-        <override name="requirementTypeId" optional="false">
+        <override name="requirementId" optional="false">
             <type-validate>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequiredFieldMissingRequirementTypeId"/>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequiredFieldMissingRequirementId"/>
             </type-validate>
         </override>
     </service>