You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/29 06:13:07 UTC
svn commit: r1343485 [3/3] - in /ofbiz/trunk/applications/order:
src/org/ofbiz/order/order/ src/org/ofbiz/order/requirement/
src/org/ofbiz/order/shoppingcart/ src/org/ofbiz/order/shoppingcart/product/
src/org/ofbiz/order/shoppinglist/ src/org/ofbiz/ord...
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Tue May 29 04:13:04 2012
@@ -49,7 +49,7 @@ under the License.
<#assign orderItemShipGrpInvResList = orderReadHelper.getOrderItemShipGrpInvResList(orderItem)>
<#if orderHeader.orderTypeId == "SALES_ORDER"><#assign pickedQty = orderReadHelper.getItemPickedQuantityBd(orderItem)></#if>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
- <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists>
+ <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)?if_exists>
<#assign productId = orderItem.productId?if_exists>
<#if productId?exists && productId == "shoppingcart.CommentLine">
<td colspan="7" valign="top" class="label"> >> ${orderItem.itemDescription}</td>
@@ -103,7 +103,7 @@ under the License.
<#else>
<td valign="top">
<#if productId?has_content>
- <#assign product = orderItem.getRelatedOneCache("Product")>
+ <#assign product = orderItem.getRelatedOne("Product", true)>
</#if>
<#if productId?exists>
<#-- INVENTORY -->
@@ -180,7 +180,7 @@ under the License.
</#if>
</td>
<#-- now show status details per line item -->
- <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")>
+ <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem", false)>
<td colspan="1" valign="top">
<div class="screenlet order-item-status-list<#if currentItemStatus.statusCode?has_content> ${currentItemStatus.statusCode}</#if>">
<div class="screenlet-body">
@@ -199,7 +199,7 @@ under the License.
</#if>
<#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)>
<#list orderItemStatuses as orderItemStatus>
- <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")>
+ <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem", false)>
<#if orderItemStatus.statusDatetime?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderItemStatus.statusDatetime, "", locale, timeZone)!} </#if>${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}
</#list>
</div>
@@ -207,7 +207,7 @@ under the License.
<#assign returns = orderItem.getRelated("ReturnItem")?if_exists>
<#if returns?has_content>
<#list returns as returnItem>
- <#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")>
+ <#assign returnHeader = returnItem.getRelatedOne("ReturnHeader", false)>
<#if returnHeader.statusId != "RETURN_CANCELLED">
<font color="red">${uiLabelMap.OrderReturned}</font>
${uiLabelMap.CommonNbr}<a href="<@o...@ofbizUrl>" class="buttontext">${returnItem.returnId}</a>
@@ -321,7 +321,7 @@ under the License.
<#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")?if_exists>
<#if workOrderItemFulfillments?has_content>
<#list workOrderItemFulfillments as workOrderItemFulfillment>
- <#assign workEffort = workOrderItemFulfillment.getRelatedOneCache("WorkEffort")>
+ <#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort", true)>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td> </td>
<td colspan="6">
@@ -349,9 +349,9 @@ under the License.
<#list linkedOrderItemsTo as linkedOrderItem>
<#assign linkedOrderId = linkedOrderItem.toOrderId>
<#assign linkedOrderItemSeqId = linkedOrderItem.toOrderItemSeqId>
- <#assign linkedOrderItemValue = linkedOrderItem.getRelatedOne("ToOrderItem")>
- <#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem")>
- <#assign description = linkedOrderItem.getRelatedOne("OrderItemAssocType").getString("description")/>
+ <#assign linkedOrderItemValue = linkedOrderItem.getRelatedOne("ToOrderItem", false)>
+ <#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem", false)>
+ <#assign description = linkedOrderItem.getRelatedOne("OrderItemAssocType", false).getString("description")/>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td> </td>
<td colspan="6">
@@ -366,9 +366,9 @@ under the License.
<#list linkedOrderItemsFrom as linkedOrderItem>
<#assign linkedOrderId = linkedOrderItem.orderId>
<#assign linkedOrderItemSeqId = linkedOrderItem.orderItemSeqId>
- <#assign linkedOrderItemValue = linkedOrderItem.getRelatedOne("FromOrderItem")>
- <#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem")>
- <#assign description = linkedOrderItem.getRelatedOne("OrderItemAssocType").getString("description")/>
+ <#assign linkedOrderItemValue = linkedOrderItem.getRelatedOne("FromOrderItem", false)>
+ <#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem", false)>
+ <#assign description = linkedOrderItem.getRelatedOne("OrderItemAssocType", false).getString("description")/>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td> </td>
<td colspan="6">
@@ -394,7 +394,7 @@ under the License.
</#list>
</#if>
<#-- show linked quote -->
- <#assign linkedQuote = orderItem.getRelatedOneCache("QuoteItem")?if_exists>
+ <#assign linkedQuote = orderItem.getRelatedOne("QuoteItem", true)?if_exists>
<#if linkedQuote?has_content>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td> </td>
@@ -409,7 +409,7 @@ under the License.
<#assign orderItemAdjustments = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentList(orderItem, orderAdjustments)>
<#if orderItemAdjustments?exists && orderItemAdjustments?has_content>
<#list orderItemAdjustments as orderItemAdjustment>
- <#assign adjustmentType = orderItemAdjustment.getRelatedOneCache("OrderAdjustmentType")>
+ <#assign adjustmentType = orderItemAdjustment.getRelatedOne("OrderAdjustmentType", true)>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderAdjustment}</span> ${adjustmentType.get("description",locale)}
@@ -419,16 +419,16 @@ under the License.
</#if>
<#if orderItemAdjustment.productPromoId?has_content>
<a href="/catalog/control/EditProductPromo?productPromoId=${orderItemAdjustment.productPromoId}&externalLoginKey=${externalLoginKey}"
- >${orderItemAdjustment.getRelatedOne("ProductPromo").getString("promoName")}</a>
+ >${orderItemAdjustment.getRelatedOne("ProductPromo", false).getString("promoName")}</a>
</#if>
<#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
<#if orderItemAdjustment.primaryGeoId?has_content>
- <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/>
+ <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/>
<#if primaryGeo.geoName?has_content>
<span class="label">${uiLabelMap.OrderJurisdiction}</span> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
</#if>
<#if orderItemAdjustment.secondaryGeoId?has_content>
- <#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/>
+ <#assign secondaryGeo = orderItemAdjustment.getRelatedOne("SecondaryGeo", true)/>
<span class="label">${uiLabelMap.CommonIn}</span> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}])
</#if>
</#if>
@@ -523,8 +523,8 @@ under the License.
<#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc")?if_exists>
<#if orderItemShipGroupAssocs?has_content>
<#list orderItemShipGroupAssocs as shipGroupAssoc>
- <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup")>
- <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists>
+ <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)>
+ <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderShipGroup}</span> [${shipGroup.shipGroupSeqId}]
@@ -609,7 +609,7 @@ under the License.
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<#if itemIssuance.inventoryItemId?has_content>
- <#assign inventoryItem = itemIssuance.getRelatedOne("InventoryItem")/>
+ <#assign inventoryItem = itemIssuance.getRelatedOne("InventoryItem", false)/>
<span class="label">${uiLabelMap.CommonInventory}</span>
<a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}&externalLoginKey=${externalLoginKey}"
class="buttontext">${itemIssuance.inventoryItemId}</a>
@@ -660,7 +660,7 @@ under the License.
</#if>
<tr><td colspan="7"><hr /></td></tr>
<#list orderHeaderAdjustments as orderHeaderAdjustment>
- <#assign adjustmentType = orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")>
+ <#assign adjustmentType = orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType", false)>
<#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)>
<#if adjustmentAmount != 0>
<tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Tue May 29 04:13:04 2012
@@ -166,7 +166,7 @@ under the License.
</#if>
</tr>
<#list orderHeaderList as orderHeader>
- <#assign status = orderHeader.getRelatedOneCache("StatusItem")>
+ <#assign status = orderHeader.getRelatedOne("StatusItem", true)>
<#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)>
<#assign billToParty = orh.getBillToParty()?if_exists>
<#assign billFromParty = orh.getBillFromParty()?if_exists>
@@ -182,14 +182,14 @@ under the License.
<#else>
<#assign billFrom = ''/>
</#if>
- <#assign productStore = orderHeader.getRelatedOneCache("ProductStore")?if_exists />
+ <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)?if_exists />
<tr>
<td><#if orderHeader.orderDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeader.orderDate, "", locale, timeZone)!}</#if></td>
<td>
<a href="<@o...@ofbizUrl>" class="buttontext">${orderHeader.orderId}</a>
</td>
<td>${orderHeader.orderName?if_exists}</td>
- <td>${orderHeader.getRelatedOneCache("OrderType").get("description",locale)}</td>
+ <td>${orderHeader.getRelatedOne("OrderType", true).get("description",locale)}</td>
<td>${billFrom?if_exists}</td>
<td>${billTo?if_exists}</td>
<td><#if productStore?has_content>${productStore.storeName?default(productStore.productStoreId)}</#if></td>
@@ -202,7 +202,7 @@ under the License.
</#if>
</#list>
</td>
- <td>${orderHeader.getRelatedOneCache("StatusItem").get("description",locale)}</td>
+ <td>${orderHeader.getRelatedOne("StatusItem", true).get("description",locale)}</td>
<#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')>
<td>
<#if filterInventoryProblems.contains(orderHeader.orderId)>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Tue May 29 04:13:04 2012
@@ -51,7 +51,7 @@ under the License.
<#list orderPaymentPreferences as orderPaymentPreference>
<#assign payments = orderPaymentPreference.getRelated("Payment")>
<#list payments as payment>
- <#assign statusItem = payment.getRelatedOne("StatusItem")>
+ <#assign statusItem = payment.getRelatedOne("StatusItem", false)>
<#assign partyName = delegator.findOne("PartyNameView", {"partyId" : payment.partyIdTo}, true)>
<tr>
<#if security.hasPermission("PAY_INFO_VIEW", session) || security.hasPermission("PAY_INFO_ADMIN", session)>
@@ -96,7 +96,7 @@ under the License.
<#assign orderPaymentStatuses = orderReadHelper.getOrderPaymentStatuses()>
<#if orderPaymentStatuses?has_content>
<#list orderPaymentStatuses as orderPaymentStatus>
- <#assign statusItem = orderPaymentStatus.getRelatedOne("StatusItem")?if_exists>
+ <#assign statusItem = orderPaymentStatus.getRelatedOne("StatusItem", false)?if_exists>
<#if statusItem?has_content>
<div>
${statusItem.get("description",locale)} <#if orderPaymentStatus.statusDatetime?has_content>- ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderPaymentStatus.statusDatetime, "", locale, timeZone)!}</#if>
@@ -114,15 +114,15 @@ under the License.
<#list orderPaymentPreferences as orderPaymentPreference>
<#assign paymentList = orderPaymentPreference.getRelated("Payment")>
<#assign pmBillingAddress = {}>
- <#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem")>
+ <#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem", false)>
<#if outputted?default("false") == "true">
<tr><td colspan="4"><hr /></td></tr>
</#if>
<#assign outputted = "true">
<#-- try the paymentMethod first; if paymentMethodId is specified it overrides paymentMethodTypeId -->
- <#assign paymentMethod = orderPaymentPreference.getRelatedOne("PaymentMethod")?if_exists>
+ <#assign paymentMethod = orderPaymentPreference.getRelatedOne("PaymentMethod", false)?if_exists>
<#if !paymentMethod?has_content>
- <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")>
+ <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType", false)>
<#if paymentMethodType.paymentMethodTypeId == "EXT_BILLACT">
<#assign outputted = "false">
<#-- billing account -->
@@ -172,10 +172,10 @@ under the License.
</tr>
</#if>
<#elseif paymentMethodType.paymentMethodTypeId == "FIN_ACCOUNT">
- <#assign finAccount = orderPaymentPreference.getRelatedOne("FinAccount")?if_exists/>
+ <#assign finAccount = orderPaymentPreference.getRelatedOne("FinAccount", false)?if_exists/>
<#if (finAccount?has_content)>
<#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse")>
- <#assign finAccountType = finAccount.getRelatedOne("FinAccountType")?if_exists/>
+ <#assign finAccountType = finAccount.getRelatedOne("FinAccountType", false)?if_exists/>
<tr>
<td align="right" valign="top" width="29%">
<div>
@@ -210,7 +210,7 @@ under the License.
<div>
<hr />
<#list gatewayResponses as gatewayResponse>
- <#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration")>
+ <#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration", false)>
${(transactionCode.get("description",locale))?default("Unknown")}:
<#if gatewayResponse.transactionDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(gatewayResponse.transactionDate, "", locale, timeZone)!} </#if>
<@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br />
@@ -318,9 +318,9 @@ under the License.
<#else>
<#if paymentMethod.paymentMethodTypeId?if_exists == "CREDIT_CARD">
<#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse")>
- <#assign creditCard = paymentMethod.getRelatedOne("CreditCard")?if_exists>
+ <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)?if_exists>
<#if creditCard?has_content>
- <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress")?if_exists>
+ <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress", false)?if_exists>
</#if>
<tr>
<td align="right" valign="top" width="29%">
@@ -370,7 +370,7 @@ under the License.
<div>
<hr />
<#list gatewayResponses as gatewayResponse>
- <#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration")>
+ <#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration", false)>
${(transactionCode.get("description",locale))?default("Unknown")}:
<#if gatewayResponse.transactionDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(gatewayResponse.transactionDate, "", locale, timeZone)!} </#if>
<@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br />
@@ -398,9 +398,9 @@ under the License.
</td>
</tr>
<#elseif paymentMethod.paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
- <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount")>
+ <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
<#if eftAccount?has_content>
- <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress")?if_exists>
+ <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress", false)?if_exists>
</#if>
<tr>
<td align="right" valign="top" width="29%">
@@ -453,9 +453,9 @@ under the License.
</tr>
</#if>
<#elseif paymentMethod.paymentMethodTypeId?if_exists == "GIFT_CARD">
- <#assign giftCard = paymentMethod.getRelatedOne("GiftCard")>
+ <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)>
<#if giftCard?exists>
- <#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress")?if_exists>
+ <#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress", false)?if_exists>
</#if>
<tr>
<td align="right" valign="top" width="29%">
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=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue May 29 04:13:04 2012
@@ -191,8 +191,8 @@ under the License.
<#if shipGroups?has_content && (!orderHeader.salesChannelEnumId?exists || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")>
<#list shipGroups as shipGroup>
- <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType")?if_exists>
- <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists>
+ <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType", false)?if_exists>
+ <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists>
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
@@ -222,7 +222,7 @@ under the License.
<#if shippingContactMechList?has_content>
<option disabled="disabled" value=""></option>
<#list shippingContactMechList as shippingContactMech>
- <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress")?if_exists>
+ <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress", false)?if_exists>
<#if shippingContactMech.contactMechId?has_content>
<option value="${shippingContactMech.contactMechId?if_exists}">${(shippingPostalAddress.address1)?default("")} - ${shippingPostalAddress.city?default("")}</option>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl Tue May 29 04:13:04 2012
@@ -35,7 +35,7 @@ under the License.
</tr>
<#list orderTerms as orderTerm>
<tr>
- <td width="35%">${orderTerm.getRelatedOne("TermType").get("description", locale)}</td>
+ <td width="35%">${orderTerm.getRelatedOne("TermType", false).get("description", locale)}</td>
<td width="15%" align="center">${orderTerm.termValue?default("")}</td>
<td width="15%" align="center">${orderTerm.termDays?default("")}</td>
<td width="35%" align="center">${orderTerm.textValue?default("")}</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Tue May 29 04:13:04 2012
@@ -51,7 +51,7 @@ under the License.
<#assign alt_row = false/>
<#list quoteItems as quoteItem>
<#if quoteItem.productId?exists>
- <#assign product = quoteItem.getRelatedOne("Product")>
+ <#assign product = quoteItem.getRelatedOne("Product", false)>
<#else>
<#assign product = null> <#-- don't drag it along to the next iteration -->
</#if>
@@ -117,7 +117,7 @@ under the License.
</#list>
<#-- now show adjustment details per line item -->
<#list quoteItemAdjustments as quoteItemAdjustment>
- <#assign adjustmentType = quoteItemAdjustment.getRelatedOne("OrderAdjustmentType")>
+ <#assign adjustmentType = quoteItemAdjustment.getRelatedOne("OrderAdjustmentType", false)>
<tr class="alternate-row">
<td align="right" colspan="4"><span class="label">${adjustmentType.get("description",locale)?if_exists}</span></td>
<td align="right"><@ofbizCurrency amount=quoteItemAdjustment.amount isoCode=quote.currencyUomId/></td>
@@ -136,7 +136,7 @@ under the License.
<#assign totalQuoteHeaderAdjustmentAmount = 0.0>
<#assign findAdjustment = false>
<#list quoteAdjustments as quoteAdjustment>
- <#assign adjustmentType = quoteAdjustment.getRelatedOne("OrderAdjustmentType")>
+ <#assign adjustmentType = quoteAdjustment.getRelatedOne("OrderAdjustmentType", false)>
<#if !quoteAdjustment.quoteItemSeqId?exists>
<#assign totalQuoteHeaderAdjustmentAmount = quoteAdjustment.amount?default(0) + totalQuoteHeaderAdjustmentAmount>
<tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Tue May 29 04:13:04 2012
@@ -42,7 +42,7 @@ under the License.
<#assign totalQuoteAmount = 0.0>
<#list quoteItems as quoteItem>
<#if quoteItem.productId?exists>
- <#assign product = quoteItem.getRelatedOne("Product")>
+ <#assign product = quoteItem.getRelatedOne("Product", false)>
</#if>
<#assign quoteItemAmount = quoteItem.quoteUnitPrice?default(0) * quoteItem.quantity?default(0)>
<#assign quoteItemAdjustments = quoteItem.getRelated("QuoteAdjustment")>
@@ -78,7 +78,7 @@ under the License.
</fo:table-row>
<#list quoteItemAdjustments as quoteItemAdjustment>
- <#assign adjustmentType = quoteItemAdjustment.getRelatedOne("OrderAdjustmentType")>
+ <#assign adjustmentType = quoteItemAdjustment.getRelatedOne("OrderAdjustmentType", false)>
<fo:table-row>
<fo:table-cell padding="2pt" background-color="${rowColor}">
</fo:table-cell>
@@ -126,7 +126,7 @@ under the License.
</fo:table-row>
<#assign totalQuoteHeaderAdjustmentAmount = 0.0>
<#list quoteAdjustments as quoteAdjustment>
- <#assign adjustmentType = quoteAdjustment.getRelatedOne("OrderAdjustmentType")>
+ <#assign adjustmentType = quoteAdjustment.getRelatedOne("OrderAdjustmentType", false)>
<#if !quoteAdjustment.quoteItemSeqId?exists>
<#assign totalQuoteHeaderAdjustmentAmount = quoteAdjustment.amount?default(0) + totalQuoteHeaderAdjustmentAmount>
<fo:table-row>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl Tue May 29 04:13:04 2012
@@ -25,8 +25,8 @@ under the License.
<table cellspacing="0" class="basic-table">
<#assign row = 1>
<#list quoteRoles as quoteRole>
- <#assign roleType = quoteRole.getRelatedOne("RoleType")>
- <#assign party = quoteRole.getRelatedOne("Party")>
+ <#assign roleType = quoteRole.getRelatedOne("RoleType", false)>
+ <#assign party = quoteRole.getRelatedOne("Party", false)>
<#assign rolePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", quoteRole.partyId, "compareDate", quote.issueDate, "userLogin", userLogin))/>
<tr>
<td align="right" valign="top" width="15%" class="label">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl Tue May 29 04:13:04 2012
@@ -34,7 +34,7 @@ under the License.
<#assign alt_row = false>
<#list requestItems as requestItem>
<#if requestItem.productId?exists>
- <#assign product = requestItem.getRelatedOne("Product")>
+ <#assign product = requestItem.getRelatedOne("Product", false)>
</#if>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td valign="top">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl Tue May 29 04:13:04 2012
@@ -21,13 +21,13 @@ under the License.
<#if "POSTAL_ADDRESS" == fulfillContactMech.contactMechTypeId>
<#assign label = uiLabelMap.PartyAddressMailingShipping>
- <#assign postalAddress = fulfillContactMech.getRelatedOneCache("PostalAddress")?if_exists>
+ <#assign postalAddress = fulfillContactMech.getRelatedOne("PostalAddress", true)?if_exists>
<#elseif "EMAIL_ADDRESS" == fulfillContactMech.contactMechTypeId>
<#assign label = uiLabelMap.PartyToEmailAddress>
<#assign emailAddress = fulfillContactMech.infoString?if_exists>
<#elseif "TELECOM_NUMBER" == fulfillContactMech.contactMechTypeId>
<#assign label = uiLabelMap.PartyPhoneNumber>
- <#assign telecomNumber = fulfillContactMech.getRelatedOneCache("TelecomNumber")?if_exists>
+ <#assign telecomNumber = fulfillContactMech.getRelatedOne("TelecomNumber", true)?if_exists>
</#if>
<div class="screenlet">
@@ -52,12 +52,12 @@ under the License.
<#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
${postalAddress.city?if_exists},
<#if postalAddress.stateProvinceGeoId?has_content>
- <#assign stateProvince = postalAddress.getRelatedOneCache("StateProvinceGeo")>
+ <#assign stateProvince = postalAddress.getRelatedOne("StateProvinceGeo", true)>
${stateProvince.abbreviation?default(stateProvince.geoId)}
</#if>
${postalAddress.postalCode?if_exists}
<#if postalAddress.countryGeoId?has_content><br />
- <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+ <#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
${country.geoName?default(country.geoId)}
</#if>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl Tue May 29 04:13:04 2012
@@ -47,7 +47,7 @@ under the License.
<option value=""></option>
<#if creditCardList?has_content>
<#list creditCardList as creditCardPm>
- <#assign creditCard = creditCardPm.getRelatedOne("CreditCard")>
+ <#assign creditCard = creditCardPm.getRelatedOne("CreditCard", false)>
<option value="${creditCard.paymentMethodId}">CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option>
</#list>
</#if>
@@ -75,7 +75,7 @@ under the License.
<td colspan="8">
<table cellspacing="0" class="basic-table">
<#list shippingContactMechList as shippingContactMech>
- <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
<tr>
<td align="right" width="1%" valign="top" nowrap="nowrap">
<input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}" <#if (shippingContactMechList?size == 1)>checked="checked"</#if> />
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl Tue May 29 04:13:04 2012
@@ -54,7 +54,7 @@ under the License.
<#else>
<select name="currencyUomId">
<#if (orderHeader?has_content) && (orderHeader.currencyUom?has_content)>
- <option value="${orderHeader.currencyUom}" selected>${orderHeader.getRelatedOne("Uom").getString("description",locale)}</option>
+ <option value="${orderHeader.currencyUom}" selected>${orderHeader.getRelatedOne("Uom", false).getString("description",locale)}</option>
<option value="${orderHeader.currencyUom}">---</option>
<#elseif defaultCurrency?has_content>
<option value="${defaultCurrency.uomId}" selected>${defaultCurrency.getString("description")}</option>
@@ -141,7 +141,7 @@ under the License.
<option value=""></option>
<#if creditCardList?has_content>
<#list creditCardList as creditCardPm>
- <#assign creditCard = creditCardPm.getRelatedOne("CreditCard")>
+ <#assign creditCard = creditCardPm.getRelatedOne("CreditCard", false)>
<option value="${creditCard.paymentMethodId}">CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option>
</#list>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl Tue May 29 04:13:04 2012
@@ -62,7 +62,7 @@ under the License.
<#if orderItem.getEntityName() == "OrderAdjustment">
<#-- this is an order item adjustment -->
<#assign returnAdjustmentType = returnItemTypeMap.get(orderItem.get("orderAdjustmentTypeId"))/>
- <#assign adjustmentType = orderItem.getRelatedOne("OrderAdjustmentType")/>
+ <#assign adjustmentType = orderItem.getRelatedOne("OrderAdjustmentType", false)/>
<#assign description = orderItem.description?default(adjustmentType.get("description",locale))/>
<tr id="returnItemId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>>
@@ -92,7 +92,7 @@ under the License.
<#-- this is an order item -->
<#assign returnItemType = (returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey")))?if_exists/>
<#-- need some order item information -->
- <#assign orderHeader = orderItem.getRelatedOne("OrderHeader")>
+ <#assign orderHeader = orderItem.getRelatedOne("OrderHeader", false)>
<#assign itemCount = orderItem.quantity>
<#assign itemPrice = orderItem.unitPrice>
<#-- end of order item information -->
@@ -123,7 +123,7 @@ under the License.
</td>
<td>
<#if orderItem.productId?exists>
- <#assign product = orderItem.getRelatedOne("Product")/>
+ <#assign product = orderItem.getRelatedOne("Product", false)/>
<#if product.productTypeId == "ASSET_USAGE_OUT_IN">
<input type="text" size="8" name="returnPrice_o_${rowCount}" value="0.00"/>
<#else>
@@ -177,7 +177,7 @@ under the License.
</tr>
<#list orderHeaderAdjustments as adj>
<#assign returnAdjustmentType = returnItemTypeMap.get(adj.get("orderAdjustmentTypeId"))/>
- <#assign adjustmentType = adj.getRelatedOne("OrderAdjustmentType")/>
+ <#assign adjustmentType = adj.getRelatedOne("OrderAdjustmentType", false)/>
<#assign description = adj.description?default(adjustmentType.get("description",locale))/>
<tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Tue May 29 04:13:04 2012
@@ -18,8 +18,8 @@ under the License.
-->
<#macro displayReturnAdjustment returnAdjustment adjEditable>
- <#assign returnHeader = returnAdjustment.getRelatedOne("ReturnHeader")>
- <#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType")?if_exists>
+ <#assign returnHeader = returnAdjustment.getRelatedOne("ReturnHeader", false)>
+ <#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType", false)?if_exists>
<#if (adjEditable)>
<input type="hidden" name="_rowSubmit_o_${rowCount}" value="Y" />
<input type="hidden" name="returnAdjustmentId_o_${rowCount}" value="${returnAdjustment.returnAdjustmentId}" />
@@ -142,11 +142,11 @@ under the License.
<#if returnItems?has_content>
<#assign alt_row = false>
<#list returnItems as item>
- <#assign orderItem = item.getRelatedOne("OrderItem")?if_exists>
- <#assign orderHeader = item.getRelatedOne("OrderHeader")?if_exists>
- <#assign returnReason = item.getRelatedOne("ReturnReason")?if_exists>
- <#assign returnType = item.getRelatedOne("ReturnType")?if_exists>
- <#assign status = item.getRelatedOne("InventoryStatusItem")?if_exists>
+ <#assign orderItem = item.getRelatedOne("OrderItem", false)?if_exists>
+ <#assign orderHeader = item.getRelatedOne("OrderHeader", false)?if_exists>
+ <#assign returnReason = item.getRelatedOne("ReturnReason", false)?if_exists>
+ <#assign returnType = item.getRelatedOne("ReturnType", false)?if_exists>
+ <#assign status = item.getRelatedOne("InventoryStatusItem", false)?if_exists>
<#assign shipmentReceipts = item.getRelated("ShipmentReceipt")?if_exists>
<#if (item.get("returnQuantity")?exists && item.get("returnPrice")?exists)>
<#assign returnTotal = returnTotal + item.get("returnQuantity") * item.get("returnPrice") >
@@ -249,7 +249,7 @@ under the License.
<#if (readOnly)>
<td>
<#if returnHeader.statusId == "RETURN_COMPLETED" || returnHeader.statusId == "SUP_RETURN_COMPLETED">
- <#assign itemResp = item.getRelatedOne("ReturnItemResponse")?if_exists>
+ <#assign itemResp = item.getRelatedOne("ReturnItemResponse", false)?if_exists>
<#if itemResp?has_content>
<#if itemResp.paymentId?has_content>
<div>${uiLabelMap.AccountingPayment} ${uiLabelMap.CommonNbr}<a href="/accounting/control/paymentOverview?paymentId=${itemResp.paymentId}${externalKeyParam}" class="buttontext">${itemResp.paymentId}</a></div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl Tue May 29 04:13:04 2012
@@ -30,9 +30,9 @@ under the License.
<td>${uiLabelMap.CommonStatus}</td>
</tr>
<#list returnList as returnHeader>
- <#assign statusItem = returnHeader.getRelatedOne("StatusItem")>
+ <#assign statusItem = returnHeader.getRelatedOne("StatusItem", false)>
<#if returnHeader.destinationFacilityId?exists>
- <#assign facility = returnHeader.getRelatedOne("Facility")>
+ <#assign facility = returnHeader.getRelatedOne("Facility", false)>
</#if>
<tr>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${returnHeader.returnId}</a></td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl Tue May 29 04:13:04 2012
@@ -18,8 +18,8 @@ under the License.
-->
<#escape x as x?xml>
<#macro displayReturnAdjustment returnAdjustment>
- <#assign returnHeader = returnAdjustment.getRelatedOne("ReturnHeader")>
- <#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType")?if_exists>
+ <#assign returnHeader = returnAdjustment.getRelatedOne("ReturnHeader", false)>
+ <#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType", false)?if_exists>
<fo:table-row>
<fo:table-cell><fo:block></fo:block></fo:table-cell>
<fo:table-cell><fo:block></fo:block></fo:table-cell>
@@ -67,11 +67,11 @@ under the License.
</fo:table-cell>
<fo:table-cell padding="1mm" font-size="8pt">
<fo:block>
- <#if returnItem.orderItemSeqId?exists>${returnItem.getRelatedOne("OrderItem").getString("productId")}</#if>
+ <#if returnItem.orderItemSeqId?exists>${returnItem.getRelatedOne("OrderItem", false).getString("productId")}</#if>
</fo:block>
</fo:table-cell>
<fo:table-cell padding="1mm"><fo:block wrap-option="wrap">${returnItem.description?if_exists}</fo:block></fo:table-cell>
- <fo:table-cell padding="1mm" font-size="8pt"><fo:block><#if returnItem.returnReasonId?exists>${(returnItem.getRelatedOne("ReturnReason")).get("description",locale)?default(returnItem.returnReasonId)}</#if></fo:block></fo:table-cell>
+ <fo:table-cell padding="1mm" font-size="8pt"><fo:block><#if returnItem.returnReasonId?exists>${(returnItem.getRelatedOne("ReturnReason", false)).get("description",locale)?default(returnItem.returnReasonId)}</#if></fo:block></fo:table-cell>
<fo:table-cell padding="1mm" text-align="right"><fo:block>${returnItem.returnQuantity}</fo:block></fo:table-cell>
<fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=returnItem.returnPrice isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell>
<fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=(returnItem.returnPrice * returnItem.returnQuantity) isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl Tue May 29 04:13:04 2012
@@ -68,7 +68,7 @@ under the License.
<#assign alt_row = false>
<#list poList as orderHeaderAndRole>
<#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeaderAndRole)>
- <#assign statusItem = orderHeaderAndRole.getRelatedOneCache("StatusItem")>
+ <#assign statusItem = orderHeaderAndRole.getRelatedOne("StatusItem", true)>
<#assign placingParty = orh.getPlacingParty()?if_exists>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class='buttontext'>${orderHeaderAndRole.orderId}</a></td>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml Tue May 29 04:13:04 2012
@@ -94,7 +94,7 @@ under the License.
</field>
<field name="paymentMethodId" use-when="creditCardList!=null&&creditCardList.size()>0">
<drop-down allow-empty="true">
- <list-options list-name="creditCardList" list-entry-name="creditCardPm" key-name="creditCardPm.paymentMethodId" description="${bsh:org.ofbiz.party.contact.ContactHelper.formatCreditCard(creditCardPm.getRelatedOne("CreditCard"))}"/>
+ <list-options list-name="creditCardList" list-entry-name="creditCardPm" key-name="creditCardPm.paymentMethodId" description="${bsh:org.ofbiz.party.contact.ContactHelper.formatCreditCard(creditCardPm.getRelatedOne("CreditCard", false))}"/>
</drop-down>
</field>
<field name="newCreditCard" widget-style="buttontext" use-when="returnHeader!=null&&returnHeader.getString("fromPartyId")!=null">