"Applied fix from trunk for revision: 1631203  " 
------------------------------------------------------------------------
r1631203 | jleroux | 2014-10-12 18:28:31 +0200 (dim. 12 oct. 2014) | 9 lignes

An enhanced patch from Josip Almasi for "Can't mount root web app" https://issues.apache.org/jira/browse/OFBIZ-5799

After mounting ecommerce as root web app, I got ScreenRenderException, caused by StringIndexOutOfBoundsException: String index out of range: -1 
at  org.ofbiz.product.category.CatalogUrlServlet.makeCatalogUrl(CatalogUrlServlet.java:186)

Categories and products cannot be rendered.

jleroux: I added 2 other cases to Josip's patch.
Note: you could mount the ecommerce as root web app between R9.04 and R11.04 (included)
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1631204 13f79535-47bb-0310-9956-ffa450edef68
Applied fix from trunk:
===
Upgraded to the latest, now official, release of Freemarker 2.3.21


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1631309 13f79535-47bb-0310-9956-ffa450edef68
Applied bug fix changes from trunk r1632733. 
======================================================

Applied bug fix from jira issue - OFBIZ-5632 - Changing Visual theme in Order manager results in error message.
===========================================================
The reported issue has been observed in the order manager application. It happens when there's no shopping cart in the session.

Steps to test -
1. Try changing visual theme in the order manager application.

Observations -
1. Returns ERROR MESSAGE - org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://order/widget/ordermgr/OrderEntryOrderScreens.xml#quickFinalizeOrder: java.lang.IllegalArgumentException: Error running script at location [component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy]: java.lang.NullPointerException: Cannot invoke method getRelated() on null object (Error running script at location [component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy]: java.lang.NullPointerException: Cannot invoke method getRelated() on null object)

Thanks.
===========================================================
Thanks Vyom for reporting the issue and Thanks Pranay for providing the patch for the same.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1632734 13f79535-47bb-0310-9956-ffa450edef68
Applied bug fix from trunk r1632745.
==================================
Applied patch from jira issue - OFBIZ-5824 - Error in communication screen while perfom sorting.
=========================================================================
In partymgr contrller.xml, we have view request named "ViewCommunicationEvent", and this request call an service event, due to this when we try to perform sorting on Child Communication Events, Customer Request List or any other screen over Communication screen then it will thorw following exception:

org.ofbiz.webapp.event.EventHandlerException: Found URL parameter [communicationEventId] passed to secure (https) request-map with uri [ViewCommunicationEvent] with an event that calls service [setCommEventRoleToRead]; this is not allowed for security reasons! The data should be encrypted by making it part of the request body (a form field) instead of the request URL. Moreover it would be kind if you could create a Jira sub-task of https://issues.apache.org/jira/browse/OFBIZ-2330 (check before if a sub-task for this error does not exist). If you are not sure how to create a Jira issue please have a look before at http://cwiki.apache.org/confluence/x/JIB2 Thank you in advance for your help.
 

Also due to this service event call on view request entry we can't open the communication events in new tab. Ideally this service should be call in screen context instead view request.

=====================================
Thanks Deepak for reporting the issue and providing the patch for the same. 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1632746 13f79535-47bb-0310-9956-ffa450edef68
Applied bug fix from trunk r1632750.
===========================================
Applied patch from jira issue - OFBIZ-4528 - Out of stock products screw up the pagination during category browsing.
===================================================================
Pagination is handled in getProductCategoryAndLimitedMembers
Then the out of stock filtering is done in CategoryDetail.groovy.
Hence the pagination is screwed up. Certain pages might show less records or no records based upon data condition.
===================================================================
Thanks Arun for the contribution and Thanks Kiran for creating the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1632760 13f79535-47bb-0310-9956-ffa450edef68
Applied bug fix from trunk r1632772.
===============================================
Applied patch from jira issue - OFBIZ-5783 - Shipment Box Type selection should be at package level instead of item level on Pack Order Screen.\
=======================================================================
The Shipment Box Type selection is at line item level on Pack Order screen where the package selection for each order item is made. It should instead be at package level next to the package weight input box.

Also, ShipmentBoxType values are supported only for USPS, which is hard coded in PackOrder.groovy.

There is a bug reported in OFBIZ-4606 for Release 11.04 but exists in Trunk as well. It should be fixed if we make the above change.
=======================================================================
Thanks Mridul for creating the issue and providing the patch for the same.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1632775 13f79535-47bb-0310-9956-ffa450edef68
Applied bug fix from trunk r1632777.
=============================================
Applied patch from jira issue - OFBIZ-5714 - Comment does not save.
===========================================================
1. find P.O.
2. select approaved p.o.
3. edit items
4 add item (at bottom of screen)
5. Comment does not save.
Note! shouldn't the comment be displayed on some of the P.O. screens?
I only know it does not save as I edited the .FTL on viewpo and pdf to include comment. Comments from the orignal create P.O. show up, ALso should be able to edit a comment, when edit items is entered.
===========================================================
Thanks Joel for creating the issue and Thanks Akash for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1632779 13f79535-47bb-0310-9956-ffa450edef68
Applied fix from trunk for revision: 1632764 
===

[OFBIZ-2618] Applying patch contributed by Arun Patidar. Thanks Arun for updated fix.
Thanks BJ for reporting the issue and providing first patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1632781 13f79535-47bb-0310-9956-ffa450edef68
Applied fix from trunk for revision: 1632793 
===

[OFBIZ-3329] Removing framework code on resources in commonext.
Thanks Divesh and Mridul for helping with resuluation.
Thanks Adrian for reporting it. 
Thanks Chris Snow for reporting the issue


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1632794 13f79535-47bb-0310-9956-ffa450edef68
Applied bug fix from trunk r1632797.
=======================================
Applied patch from jira issue - OFBIZ-5826 - Shipper Account screen not rendering shipper accounts.
===========================================
Here is the steps to regenerate issue:
{code}
<PortalPagePortlet portalPageId="PartyProfile" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00001" sequenceNum="7"/>
{code}

Upload the PortalPagePortlet data for shipper Account, and go to viewprofile screen. Now add shipper account from shipper account screen.

Expected Result: Newly added/ all shipper account of party should be listed under shipper account screen.

Actual Result:
No shipper accounts are listing.
===========================================
Thanks Deepak for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1632798 13f79535-47bb-0310-9956-ffa450edef68
Applied changes from trunk r1632801.
=======================================================
Applied patch from jira issue - OFBIZ-4668 - CommunicationEventAndRole entity: Field with name custRequestDate not found.
==============================================================================
when displaying this portal page:
https://localhost:8443/myportal/control/main?portalPageId=MYPORTAL_EMPLOYEE0&parentPortalPageId=MYPORTAL_EMPLOYEE

this message is thrown to the console:
Message: Roll back error, could not commit transaction, was rolled back instead because of: Error in Service [executeFind]: Error running Find on the CommunicationEventAndRole entity: Field with name custRequestDate not found in the CommunicationEventAndRole Entity
==============================================================================
Thanks Mridul for the contribution and thanks Erwan for creating the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1632802 13f79535-47bb-0310-9956-ffa450edef68
Applied bug fix from trunk r1632803.
=============================================
Applied patch from jira issue - OFBIZ-3382 - inter-app hyperlink generates incorrect url.
Thanks Pranay for the contribution and thanks Nathan for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1632804 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1633100  " 
------------------------------------------------------------------------
r1633100 | jleroux | 2014-10-20 13:06:59 +0200 (lun. 20 oct. 2014) | 3 lignes

A patch from Deepak Dixit for "The updation and deletion of content meta data tab is not working.Needs a change of entity ContentMetaData." https://issues.apache.org/jira/browse/OFBIZ-4927

MetaDataValue is changed from primary key to non primary key as the value can be updated.
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1633101 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1633188  " 
------------------------------------------------------------------------
r1633188 | jleroux | 2014-10-20 19:25:08 +0200 (lun. 20 oct. 2014) | 1 ligne

During their last bug crush the HMW missed those (related to OFBIZ-5783 and OFBIZ-4606)
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1633189 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1633550 " (Conflicts handled by hand, surely done: same file than in trunk HEAD)
------------------------------------------------------------------------
r1633550 | jacopoc | 2014-10-22 09:50:08 +0200 (mer. 22 oct. 2014) | 7 lignes

Some modifications to the default configuration of log4j2:
1) added a comment to summarize the default configuration, with a reference to the online log4j2 documentation for further customizations
2) added a new appender for errors (or greater); implemented using a filter to keep the logger definition as clean as possible
3) removed the external appender because the amount of log statements (warnings or greater) from external jars is not large and should not cause much confusion if we keep them with OFBiz log statements
4) increased the number of rolling files for ofbiz.log to 10
5) changed date format to "yyyy-mm-dd hh:mm:ss.sss"

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1633570 13f79535-47bb-0310-9956-ffa450edef68
Removing unused import statements, I forgot to remove it in commit revision r1632760. Thanks Gil for your message on Dev list.

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