svn commit: r1835965 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/accounting/groovyScripts/rate/RateServices.groovy

[Deepak Dixit-5]

Author: deepak
Date: Sun Jul 15 10:48:39 2018
New Revision: 1835965

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

Fixed: Not able to delete PartyRate
(OFBIZ-10483)


Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/groovyScripts/rate/RateServices.groovy

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 15 10:48:39 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,1835887,1835891,1835953
+/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,1835891,1835953,1835964

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=1835965&r1=1835964&r2=1835965&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 Sun Jul 15 10:48:39 2018
@@ -119,9 +119,11 @@ def expirePartyRate() {
         lookedUpValue.store()
 
         //expire related rate amount
+        if (parameters.rateAmountFromDate) {
         parameters.fromDate = parameters.rateAmountFromDate;
         result = run service: 'expireRateAmount', with: parameters
         if (ServiceUtil.isError(result)) return result
+        }
     }
     return success()
 }