svn commit: r1543749 - in /ofbiz/branches/release11.04: ./ specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl

Author: jleroux
Date: Wed Nov 20 09:58:11 2013
New Revision: 1543749

URL: http://svn.apache.org/r1543749
Log:
"Applied fix from trunk for revision: 1543744"
------------------------------------------------------------------------
r1543744 | jleroux | 2013-11-20 10:54:03 +0100 (mer. 20 nov. 2013) | 1 ligne

Fixes a wrong rendered info in case of promotion
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1543744

Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1543749&r1=1543748&r2=1543749&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Wed Nov 20 09:58:11 2013
@@ -238,8 +238,8 @@ under the License.
       <#list itemAdjustments as orderItemAdjustment>
         <tr>
           <td>
-            ${uiLabelMap.EcommerceAdjustment}: ${localOrderReadHelper.getAdjustmentType(orderItemAdjustment)}
-            <#if orderItemAdjustment.description?has_content>: ${orderItemAdjustment.description}</#if>
+            ${uiLabelMap.EcommerceAdjustment}: ${StringUtil.wrapString(localOrderReadHelper.getAdjustmentType(orderItemAdjustment))}
+            <#if orderItemAdjustment.description?has_content>: ${StringUtil.wrapString(orderItemAdjustment.description)}</#if>
             <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
               <#if orderItemAdjustment.primaryGeoId?has_content>
                 <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/>