Based on Adrian's recent comment, committing the changes from OrderReturnServices.xml file. Thanks ofbiz.us team for providing updated patch. 

==============================================================
Please do not use the <calculate> element. Mini-language supports UEL:

<set field="totalsMap[receipt.returnItemSeqId]" from="receipt.quantityAccepted + receipt.quantityRejected />

Also, the <set> element "from-field" attribute has been deprecated, use "from".

Mini-language has an updated schema, it would be best if you configured your XML editor to use it.
==============================================================

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1618569 13f79535-47bb-0310-9956-ffa450edef68
[Rhino] Trailing comma is not legal in an ECMA-262 object initializer

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1618570 13f79535-47bb-0310-9956-ffa450edef68
Useful comment I forgot to commit with r1612202

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1618574 13f79535-47bb-0310-9956-ffa450edef68
OFBIZ-5287: Upgrade to Log4j2


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1618831 13f79535-47bb-0310-9956-ffa450edef68
Removed reference to a jar file removed with the upgrade to Log4j2

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1619038 13f79535-47bb-0310-9956-ffa450edef68
Updated jar in .classpath file after upgrade to Log4j2; thanks to Deepak Dixit for the report.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1619087 13f79535-47bb-0310-9956-ffa450edef68
OFBIZ-5514 correct calculation of seconds (instead of minutes) in EntitySyncServices.cleanSyncRemoveInfo(). Thanks to Roberto Benítez Monje for reporting


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1619098 13f79535-47bb-0310-9956-ffa450edef68
Upgraded two j2ee spec jars from Geronimo.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1619300 13f79535-47bb-0310-9956-ffa450edef68
Upgraded Derby (embedded dbms) to the latest bug fix release 10.10.2.0

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1619319 13f79535-47bb-0310-9956-ffa450edef68
Trivial fix to a log statement.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1619799 13f79535-47bb-0310-9956-ffa450edef68
Experimental branch to implement some framework API cleanup.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1619853 13f79535-47bb-0310-9956-ffa450edef68
Small simplification: thread safety is now implemented using a static initialization rather than an AtomicReference.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1619858 13f79535-47bb-0310-9956-ffa450edef68
Removed all but one of the (static) method of TransactionFactory:
* getCursorConnection(...) has been moved to TransactionUtil where it makes more sense
* removed all the wrappers method around TransactionFactoryInterface methods: they are not required now that the client code can use the interface methods


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1619868 13f79535-47bb-0310-9956-ffa450edef68
Renamed the class org.ofbiz.entity.transaction.TransactionFactory into org.ofbiz.entity.transaction.TransactionFactoryLoader: this name better describe its purpose.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1619871 13f79535-47bb-0310-9956-ffa450edef68
Fix for wrong class name in Javadoc

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1619872 13f79535-47bb-0310-9956-ffa450edef68
EntityConfig now implements the singleton pattern; thread safety is implemented with a static initialization.
Removed the EntityConfigUtil class whose main purpose was to guarantee that only one instance of EntityConfig would be initialized (no more required since now EntityConfig is a singleton); moved a couple of its static methods to the EntityConfig class.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1619976 13f79535-47bb-0310-9956-ffa450edef68
Call the overloaded method instead of duplicating its content.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1619977 13f79535-47bb-0310-9956-ffa450edef68
Removed unused method.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1619978 13f79535-47bb-0310-9956-ffa450edef68
Removed dependency of ConnectionFactory on TransactionFactoryLoader.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1619979 13f79535-47bb-0310-9956-ffa450edef68
Small simplification: thread safety is now implemented using a static initialization rather than an AtomicReference.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1619981 13f79535-47bb-0310-9956-ffa450edef68