You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2007/02/07 10:34:10 UTC
svn commit: r504475 - in
/ofbiz/trunk/applications/order/webapp/ordermgr/entry:
SetItemShipGroups.ftl optionsettings.ftl order/shipGroupConfirmSummary.ftl
Author: lektran
Date: Wed Feb 7 01:34:06 2007
New Revision: 504475
URL: http://svn.apache.org/viewvc?view=rev&rev=504475
Log:
Fixed a couple of references to PartyGroup.description which isn't a valid field of PartyGroup, related to OFBIZ-673 reported by Daniel Kunkel.
Note this may not resolve that issue completely
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl?view=diff&rev=504475&r1=504474&r2=504475
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl Wed Feb 7 01:34:06 2007
@@ -34,7 +34,7 @@
<table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2">
- <div class="head1">${uiLabelMap.OrderShipGroup} # ${currIndex}<#if supplier?has_content> - ${supplier.description?default(supplier.partyId)}</#if></div>
+ <div class="head1">${uiLabelMap.OrderShipGroup} # ${currIndex}<#if supplier?has_content> - ${supplier.groupName?default(supplier.partyId)}</#if></div>
</td>
</tr>
<tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?view=diff&rev=504475&r1=504474&r2=504475
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Wed Feb 7 01:34:06 2007
@@ -39,7 +39,7 @@
<table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2">
- <div class="head1"><b>${uiLabelMap.OrderShipGroup} # ${currIndex}</b><#if supplier?has_content> - ${supplier.description?default(supplier.partyId)}</#if></div>
+ <div class="head1"><b>${uiLabelMap.OrderShipGroup} # ${currIndex}</b><#if supplier?has_content> - ${supplier.groupName?default(supplier.partyId)}</#if></div>
</td>
</tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl?view=diff&rev=504475&r1=504474&r2=504475
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Wed Feb 7 01:34:06 2007
@@ -83,7 +83,7 @@
<td rowspan="${numberOfItems}" valign="top" class="tabletext">
<#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getSupplierPartyId()))?if_exists />
- <#if supplier?has_content>${supplier.description?default(supplier.partyId)}</#if>
+ <#if supplier?has_content>${supplier.groupName?default(supplier.partyId)}</#if>
</td>
<#-- carrier column (also spans rows = number of items) -->
@@ -91,7 +91,7 @@
<td rowspan="${numberOfItems}" valign="top" class="tabletext">
<#assign carrier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getCarrierPartyId()))?if_exists />
<#assign method = delegator.findByPrimaryKey("ShipmentMethodType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentMethodTypeId", cartShipInfo.getShipmentMethodTypeId()))?if_exists />
- <#if carrier?has_content>${carrier.description?default(carrier.partyId)}</#if>
+ <#if carrier?has_content>${carrier.groupName?default(carrier.partyId)}</#if>
<#if method?has_content>${method.description?default(method.shipmentMethodTypeId)}</#if>
</td>