You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/09/22 18:37:00 UTC
svn commit: r1704666 - in /ofbiz/trunk/applications/order/webapp/ordermgr:
WEB-INF/actions/order/OrderView.groovy order/ordershippinginfo.ftl
Author: jleroux
Date: Tue Sep 22 16:36:57 2015
New Revision: 1704666
URL: http://svn.apache.org/viewvc?rev=1704666&view=rev
Log:
No functional change: in relation with OFBIZ-6649, though we have not (yet) removed the deprecated methods from GenericValue this commit replaces deprecated getRelated() calls in a 1st preparation of this removing .
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1704666&r1=1704665&r2=1704666&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Tue Sep 22 16:36:57 2015
@@ -194,7 +194,7 @@ if (orderHeader) {
}
OISGAssContents = [];
shipGroups.each { shipGroup ->
- OISGAssContents.addAll(EntityUtil.filterByAnd(shipGroup.getRelated("OrderItemShipGroupAssoc"), UtilMisc.toMap("orderItemSeqId", orderItem.getString("orderItemSeqId"))));
+ OISGAssContents.addAll(EntityUtil.filterByAnd(shipGroup.getRelated("OrderItemShipGroupAssoc", null, null, false), UtilMisc.toMap("orderItemSeqId", orderItem.getString("orderItemSeqId"))));
}
BigDecimal totalQuantityPlanned = 0;
OISGAssContents.each { OISGAssContent ->
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=1704666&r1=1704665&r2=1704666&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Sep 22 16:36:57 2015
@@ -249,7 +249,7 @@ under the License.
<input type="hidden" name="orderItemSeqId" value="${orderItem.orderItemSeqId}"/>
<#list OISGAssContents as OISGAssContent>
<#assign OISG = OISGAssContent.getRelatedOne("OrderItemShipGroup")>
- <#assign orderShipments = OISGAssContent.getRelated("OrderShipment")>
+ <#assign orderShipments = OISGAssContent.getRelated("OrderShipment", null, null, false)>
<tr>
<input name="_rowSubmit_o_${rowCount}" value="Y" type="hidden">
<input type="hidden" name="orderId_o_${rowCount}" value="${orderId}"/>
@@ -516,8 +516,8 @@ under the License.
</script>
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<#if shipGroup.supplierPartyId?has_content>
- <tr><td colspan="3"><hr /></td></tr>
- <#assign OISGAContent = shipGroup.getRelated("OrderItemShipGroupAssoc")>
+ <tr><td colspan="3"><hr /></td></tr>
+ <#assign OISGAContent = shipGroup.getRelated("OrderItemShipGroupAssoc", null, null, false)>
<#if OISGAContent.size() == 0>
<tr>
<td colspan="3" valign="top" width="100%" align="center">