svn commit: r1609398 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

[jacopoc]

Author: jacopoc
Date: Thu Jul 10 05:48:26 2014
New Revision: 1609398

URL: http://svn.apache.org/r1609398
Log:
Fix by Deepak Dixit for bug reported by Vyom Jain in OFBIZ-5602: Sales Order with dropship item(s) uses non-existent GenericValue field to display supplier information.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1609398&r1=1609397&r2=1609398&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Thu Jul 10 05:48:26 2014
@@ -366,7 +366,6 @@ under the License.
       </script>
       <table width="100%" border="0" cellpadding="1" cellspacing="0">
         <#if shipGroup.supplierPartyId?has_content>
-          <#assign supplier =  delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shipGroup.supplierPartyId), false)?if_exists />
           <tr><td colspan="3"><hr /></td></tr>
           <tr>
             <td align="right" valign="top" width="15%">
@@ -374,7 +373,7 @@ under the License.
             </td>
             <td width="5">&nbsp;</td>
             <td valign="top" width="80%">
-              <#if supplier?has_content> - ${supplier.description?default(shipGroup.supplierPartyId)}</#if>
+              ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, shipGroup.supplierPartyId, false)!shipGroup.supplierPartyId}
             </td>
           </tr>
         </#if>