"Applied fix from trunk for revision: 1643341  " 
------------------------------------------------------------------------
r1643341 | jleroux | 2014-12-05 17:10:22 +0100 (ven. 05 déc. 2014) | 4 lignes

This fixes <<"Please Select Your Shipping Method" error sometimes occurs when updating order items>> bugs https://issues.apache.org/jira/browse/OFBIZ-5430

Fixes a long standing issue in OrderServices.saveUpdatedCartToOrder() where an empty csi may be initially added to ShoppingCart.shipInfo() by ShoppingCart.setItemShipGroupQty() (called indirectly by ShoppingCart.setUserLogin() and then ProductPromoWorker.doPromotions(), etc.). Then shipGroupsSize > realShipGroupsSize are different (+1 for shipGroupsSize), so simply bypass the 1st empty csi. This prevents the "Please Select Your Shipping Method" error, pfew...

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1643342 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1643423  " Backported by hand
------------------------------------------------------------------------
r1643423 | jleroux | 2014-12-05 21:41:38 +0100 (ven. 05 déc. 2014) | 2 lignes

A patch from Deepak for "Party Content Upload Ajax Is Broken" https://issues.apache.org/jira/browse/OFBIZ-5891, thanks to Adrian's report

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1643424 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1644904" 
------------------------------------------------------------------------
r1644904 | jleroux | 2014-12-12 15:46:56 +0100 (ven. 12 déc. 2014) | 4 lignes

A patch from Leon for ""Value" attribute of hidden form field is overridden by same name value in context" https://issues.apache.org/jira/browse/OFBIZ-5904

Uses URLEncoder.encode while rendering a link
Uses StringUtil.htmlEncoder.encode while rendering a form field. 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1644905 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1645950  "  3 conflicts handled by hand
------------------------------------------------------------------------
r1645950 | jleroux | 2014-12-16 14:45:54 +0100 (mar. 16 déc. 2014) | 3 lignes

A patch from Leon for "correction to changeset r1626462  and r1626463  " https://issues.apache.org/jira/browse/OFBIZ-5869

Uses now timestamp to replace "null" value.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1645954 13f79535-47bb-0310-9956-ffa450edef68
Completes r1645954, I got a power outage here and things got complicated :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1645977 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/release13.07' into release13.07