You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2014/07/10 07:48:53 UTC
svn commit: r1609399 - in /ofbiz/branches/release13.07: ./
applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Author: jacopoc
Date: Thu Jul 10 05:48:52 2014
New Revision: 1609399
URL: http://svn.apache.org/r1609399
Log:
Applied fix from trunk for revision: 1609398
===
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/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1609398
Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1609399&r1=1609398&r2=1609399&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Thu Jul 10 05:48:52 2014
@@ -368,7 +368,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%">
@@ -376,7 +375,7 @@ under the License.
</td>
<td width="5"> </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>