svn commit: r1835888 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/accounting/groovyScripts/rate/RateServices.groovy applications/workeffort/webapp/workeffort/WEB-INF/controller.xml

[akashjain]

Author: akashjain
Date: Sat Jul 14 09:11:44 2018
New Revision: 1835888

URL: http://svn.apache.org/viewvc?rev=1835888&view=rev
Log:
Applied fix from trunk for revision: 1835887
===

Fixed: Not able to expire the rate amount and an error is displayed in Workeffort (OFBIZ-10114)

Thanks, Rubia Elza Joshep and Chandrashekhar Dhakad for your contibution.

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/groovyScripts/rate/RateServices.groovy
    ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 14 09:11:44 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,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235
+/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,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/groovyScripts/rate/RateServices.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/groovyScripts/rate/RateServices.groovy?rev=1835888&r1=1835887&r2=1835888&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/groovyScripts/rate/RateServices.groovy (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/groovyScripts/rate/RateServices.groovy Sat Jul 14 09:11:44 2018
@@ -34,7 +34,7 @@ def updateRateAmount() {
     if (!newEntity.rateCurrencyUomId) {
         newEntity.rateCurrencyUomId = UtilProperties.getPropertyValue('general.properties', 'currency.uom.id.default')
     }
-    if (!newEntity.fromDate) newEntity.fromDate = UtilDateTime.getDayStart(UtilDateTime.nowTimestamp())
+    if (!newEntity.fromDate) newEntity.fromDate = UtilDateTime.nowTimestamp()
     newEntity.thruDate = null
 
     //Check if the entry is already exist with a different rate else expire the older to create the new one
@@ -48,7 +48,7 @@ def updateRateAmount() {
     if (rateAmountLookedUpValue) {
         updating = (rateAmountLookedUpValue.fromDate.compareTo(newEntity.fromDate) == 0)
         if (rateAmountLookedUpValue.rateAmount != rateAmount) {
-            result = run service: 'expireRateAmount', with: rateAmountLookedUpValue
+            result = run service: 'expireRateAmount', with: rateAmountLookedUpValue.getAllFields()
             if (ServiceUtil.isError(result)) return result
         } else {
             return error(UtilProperties.getMessage('AccountingErrorUiLabels', 'AccountingUpdateRateAmountAlreadyExist', locale))

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=1835888&r1=1835887&r2=1835888&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Sat Jul 14 09:11:44 2018
@@ -178,7 +178,7 @@ under the License.
     </request-map>
     <request-map uri="deleteWorkEffortRate">
         <security https="true" auth="true"/>
-        <event type="service" invoke="deleteRateAmount"/>
+        <event type="service" invoke="expireRateAmount"/>
         <response name="success" type="view" value="EditWorkEffortRates"/>
         <response name="error" type="view" value="EditWorkEffortRates"/>
     </request-map>