svn commit: r1608527 - in /ofbiz/branches/release13.07: ./ applications/product/webapp/facility/shipment/PackOrder.ftl

Author: jleroux
Date: Mon Jul  7 17:51:23 2014
New Revision: 1608527

URL: http://svn.apache.org/r1608527
Log:
"Applied fix from trunk for revision: 1608526"
------------------------------------------------------------------------
r1608526 | jleroux | 2014-07-07 19:50:39 +0200 (lun. 07 juil. 2014) | 3 lignes

In certain cases you need to protect from possible bugs here. This is what these changes do.
Improves indentation
Use real description for "Carrier Shipment Method" instead of only ID
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1608526

Modified: ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1608527&r1=1608526&r2=1608527&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/facility/shipment/PackOrder.ftl Mon Jul  7 17:51:23 2014
@@ -150,29 +150,33 @@ under the License.
         </div>
         <div class="screenlet-body">
               <#if orderItemShipGroup?has_content>
-                <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress", false)>
+                <#if (orderItemShipGroup.contacMechId)?has_content>
+                  <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress", false)>
+                </#if>
                 <#assign carrier = orderItemShipGroup.carrierPartyId?default("N/A")>
                 <table cellpadding="4" cellspacing="4" class="basic-table">
                   <tr>
                     <td valign="top">
-                      <span class="label">${uiLabelMap.ProductShipToAddress}</span>
-                      <br />
-                      ${uiLabelMap.CommonTo}: ${postalAddress.toName?default("")}
-                      <br />
-                      <#if postalAddress.attnName?has_content>
-                          ${uiLabelMap.CommonAttn}: ${postalAddress.attnName}
-                          <br />
-                      </#if>
-                      ${postalAddress.address1}
-                      <br />
-                      <#if postalAddress.address2?has_content>
-                          ${postalAddress.address2}
-                          <br />
+                      <#if postalAddress?exists >
+                        <span class="label">${uiLabelMap.ProductShipToAddress}</span>
+                        <br />
+                        ${uiLabelMap.CommonTo}: ${postalAddress.toName?default("")}
+                        <br />
+                        <#if postalAddress.attnName?has_content>
+                            ${uiLabelMap.CommonAttn}: ${postalAddress.attnName}
+                            <br />
+                        </#if>
+                        ${postalAddress.address1}
+                        <br />
+                        <#if postalAddress.address2?has_content>
+                            ${postalAddress.address2}
+                            <br />
+                        </#if>
+                        ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists}
+                        <br />
+                        ${postalAddress.countryGeoId!}
+                        <br />
                       </#if>
-                      ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists}
-                      <br />
-                      ${postalAddress.countryGeoId}
-                      <br />
                     </td>
                     <td>&nbsp;</td>
                     <td valign="top">
@@ -189,7 +193,8 @@ under the License.
                         <font color="${color}">${carrier}</font>
                         &nbsp;
                       </#if>
-                      ${orderItemShipGroup.shipmentMethodTypeId?default("??")}
+                      <#assign description = (delegator.findOne("ShipmentMethodType", {"shipmentMethodTypeId":orderItemShipGroup.shipmentMethodTypeId}, false)).description>
+                      ${description!"??"}
                       <br />
                       <span class="label">${uiLabelMap.ProductEstimatedShipCostForShipGroup}</span>
                       <br />