OFBIZ-5896 This commits fixes a regression I introduced with rev. 1635232 (this actually reverts that commit) and provides a different and better fix for the error affecting the "Did you know?" screenlet.
ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod was not using the passed contentId in condition list, and also was not using the ContentAssocDataResourceViewFrom/To view entity to get the result. Thanks to Deepak Dixit for the patch.
Misc minor cleanups (removed commented out code) and some small formatting fixes.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1643061 13f79535-47bb-0310-9956-ffa450edef68
Implements "Allow to edit ship groups contents after and order has been created" https://issues.apache.org/jira/browse/OFBIZ-5761

From an UI perspective this adds a "View ship group by order item" button which allows to create new ship groups by order items and to move the quantity of the order item between ship groups.
This is the adaptation of the "oisg-management" addon for R12.04 to the trunk. Thanks to Nicolas and Leila from Nereides for their help

For more information refer to the Jira issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1643077 13f79535-47bb-0310-9956-ffa450edef68
OFBIZ-5894 When ContentWorker.renderContentAsText is used to render content that have electronicText with empty textData then it renders a string with the "null" value: this commit fix the issue. Thanks to Deepak Dixit for the bug report and fix.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1643088 13f79535-47bb-0310-9956-ffa450edef68
No functional changes, only formatting

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1643170 13f79535-47bb-0310-9956-ffa450edef68