You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2015/02/11 07:46:32 UTC
svn commit: r1658887 - in /ofbiz/branches/release14.12: ./
applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
Author: jacopoc
Date: Wed Feb 11 06:46:32 2015
New Revision: 1658887
URL: http://svn.apache.org/r1658887
Log:
Applied fix from trunk for revision: 1658882
===
Fixed wrong minilang element I have committed recently as part of the currency exchange gain/losses GL transaction handling. Thanks to Deepak Dixit for spotting this.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 11 06:46:32 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882
Modified: ofbiz/branches/release14.12/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1658887&r1=1658886&r2=1658887&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/branches/release14.12/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Wed Feb 11 06:46:32 2015
@@ -2445,8 +2445,8 @@ under the License.
<if>
<condition>
<or>
- <condition field-name="invoice.statusId" operator="equals" value="INVOICE_READY"/>
- <condition field-name="invoice.statusId" operator="equals" value="INVOICE_PAID"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_READY"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_PAID"/>
</or>
</condition>
<then>