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 [2/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/WEB-INF/actions/entry/catalog/CompareProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CompareProducts.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CompareProducts.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CompareProducts.groovy Tue May 29 04:13:04 2012
@@ -64,7 +64,7 @@ compareList.each { product ->
cond = EntityCondition.makeCondition(condList);
productFeatureAppls = delegator.findList("ProductFeatureAppl", cond, null, ["sequenceNum"], null, true);
productFeatureAppls.each { productFeatureAppl ->
- productFeature = productFeatureAppl.getRelatedOneCache("ProductFeature");
+ productFeature = productFeatureAppl.getRelatedOne("ProductFeature", true);
if (!productData[productFeature.productFeatureTypeId]) {
productData[productFeature.productFeatureTypeId] = [:];
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy Tue May 29 04:13:04 2012
@@ -283,7 +283,7 @@ if (inlineProduct) {
}
numberFormat = NumberFormat.getCurrencyInstance(locale);
variants.each { variantAssoc ->
- variant = variantAssoc.getRelatedOne("AssocProduct");
+ variant = variantAssoc.getRelatedOne("AssocProduct", false);
// Get the price for each variant. Reuse the priceContext already setup for virtual product above and replace the product
if (cart.isSalesOrder()) {
// sales order: run the "calculateProductPrice" service
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy Tue May 29 04:13:04 2012
@@ -50,7 +50,7 @@ if (productId) {
virtualVariantProductAssocs = EntityUtil.filterByDate(virtualVariantProductAssocs);
if (virtualVariantProductAssocs) {
productAssoc = EntityUtil.getFirst(virtualVariantProductAssocs);
- product = productAssoc.getRelatedOneCache("AssocProduct");
+ product = productAssoc.getRelatedOne("AssocProduct", true);
}
}
}
@@ -112,7 +112,7 @@ if (productId) {
keywords.add(catalogName);
members = delegator.findByAnd("ProductCategoryMember", [productId : productId], null, true);
members.each { member ->
- category = member.getRelatedOneCache("ProductCategory");
+ category = member.getRelatedOne("ProductCategory", true);
if (category.description) {
categoryContentWrapper = new CategoryContentWrapper(category, request);
categoryDescription = categoryContentWrapper.DESCRIPTION;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy Tue May 29 04:13:04 2012
@@ -247,8 +247,8 @@ if (product) {
if(productVirtualVariants){
productVirtualVariants.each { virtualVariantKey ->
mainProductMap = [:];
- mainProduct = virtualVariantKey.getRelatedOneCache("MainProduct");
- quantityUom = mainProduct.getRelatedOneCache("QuantityUom");
+ mainProduct = virtualVariantKey.getRelatedOne("MainProduct", true);
+ quantityUom = mainProduct.getRelatedOne("QuantityUom", true);
mainProductMap.productId = mainProduct.productId;
mainProductMap.piecesIncluded = mainProduct.piecesIncluded;
mainProductMap.uomDesc = quantityUom.description;
@@ -404,7 +404,7 @@ if (product) {
}
numberFormat = NumberFormat.getCurrencyInstance(locale);
variants.each { variantAssoc ->
- variant = variantAssoc.getRelatedOne("AssocProduct");
+ variant = variantAssoc.getRelatedOne("AssocProduct", false);
// Get the price for each variant. Reuse the priceContext already setup for virtual product above and replace the product
priceContext.product = variant;
if (cart.isSalesOrder()) {
@@ -448,7 +448,7 @@ if (product) {
if(virtualVariants){
virtualVariants.each { virtualAssoc ->
- virtual = virtualAssoc.getRelatedOne("MainProduct");
+ virtual = virtualAssoc.getRelatedOne("MainProduct", false);
// Get price from a virtual product
priceContext.product = virtual;
if (cart.isSalesOrder()) {
@@ -526,7 +526,7 @@ if (product) {
variantPriceJS.append("function getVariantPrice(sku) { ");
virtualVariants.each { virtualAssoc ->
- virtual = virtualAssoc.getRelatedOne("MainProduct");
+ virtual = virtualAssoc.getRelatedOne("MainProduct", false);
// Get price from a virtual product
priceContext.product = virtual;
if (cart.isSalesOrder()) {
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy Tue May 29 04:13:04 2012
@@ -137,8 +137,8 @@ if (product) {
if(productVirtualVariants){
productVirtualVariants.each { virtualVariantKey ->
mainProductMap = [:];
- mainProduct = virtualVariantKey.getRelatedOneCache("MainProduct");
- quantityUom = mainProduct.getRelatedOneCache("QuantityUom");
+ mainProduct = virtualVariantKey.getRelatedOne("MainProduct", true);
+ quantityUom = mainProduct.getRelatedOne("QuantityUom", true);
mainProductMap.productId = mainProduct.productId;
mainProductMap.piecesIncluded = mainProduct.piecesIncluded;
mainProductMap.uomDesc = quantityUom.description;
@@ -170,7 +170,7 @@ if (product) {
variantPriceJS.append("function getVariantPrice(sku) { ");
virtualVariants.each { virtualAssoc ->
- virtual = virtualAssoc.getRelatedOne("MainProduct");
+ virtual = virtualAssoc.getRelatedOne("MainProduct", false);
// Get price from a virtual product
priceContext.product = virtual;
if (cart.isSalesOrder()) {
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy Tue May 29 04:13:04 2012
@@ -26,8 +26,8 @@ if (product) {
def mainProducts = [];
productVirtualVariants.each { virtualVariantKey ->
mainProductMap = [:];
- mainProduct = virtualVariantKey.getRelatedOneCache("MainProduct");
- quantityUom = mainProduct.getRelatedOneCache("QuantityUom");
+ mainProduct = virtualVariantKey.getRelatedOne("MainProduct", true);
+ quantityUom = mainProduct.getRelatedOne("QuantityUom", true);
mainProductMap.productId = mainProduct.productId;
mainProductMap.piecesIncluded = mainProduct.piecesIncluded;
mainProductMap.uomDesc = quantityUom.description;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Tue May 29 04:13:04 2012
@@ -44,7 +44,7 @@ if (!orderHeader && orderId) {
orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false);
} else if (shipmentId) {
shipment = delegator.findOne("Shipment", [shipmentId : shipmentId], false);
- orderHeader = shipment.getRelatedOne("PrimaryOrderHeader");
+ orderHeader = shipment.getRelatedOne("PrimaryOrderHeader", false);
}
if (!invoice && invoiceId) {
@@ -71,7 +71,7 @@ if (orderHeader) {
if (orh.getBillFromParty()) {
partyId = orh.getBillFromParty().partyId;
} else {
- productStore = orderHeader.getRelatedOne("ProductStore");
+ productStore = orderHeader.getRelatedOne("ProductStore", false);
if (orderHeader.orderTypeId.equals("SALES_ORDER") && productStore?.payToPartyId) {
partyId = productStore.payToPartyId;
}
@@ -102,7 +102,7 @@ if (orderHeader) {
partyId = returnHeader.fromPartyId;
}
} else if (quote) {
- productStore = quote.getRelatedOne("ProductStore");
+ productStore = quote.getRelatedOne("ProductStore", false);
if (productStore?.payToPartyId) {
partyId = productStore.payToPartyId;
}
@@ -148,11 +148,11 @@ if (selAddresses) {
}
if (address) {
// get the country name and state/province abbreviation
- country = address.getRelatedOneCache("CountryGeo");
+ country = address.getRelatedOne("CountryGeo", true);
if (country) {
context.countryName = country.get("geoName", locale);
}
- stateProvince = address.getRelatedOneCache("StateProvinceGeo");
+ stateProvince = address.getRelatedOne("StateProvinceGeo", true);
if (stateProvince) {
context.stateProvinceAbbr = stateProvince.abbreviation;
}
@@ -184,7 +184,7 @@ if (selEmails) {
if (selContacts) {
i = selContacts.iterator();
while (i.hasNext()) {
- email = i.next().getRelatedOne("ContactMech");
+ email = i.next().getRelatedOne("ContactMech", false);
if ("ELECTRONIC_ADDRESS".equals(email.contactMechTypeId)) {
context.email = email;
break;
@@ -204,7 +204,7 @@ selContacts = EntityUtil.filterByDate(co
if (selContacts) {
Iterator i = selContacts.iterator();
while (i.hasNext()) {
- website = i.next().getRelatedOne("ContactMech");
+ website = i.next().getRelatedOne("ContactMech", false);
if ("WEB_ADDRESS".equals(website.contactMechTypeId)) {
context.website = website;
break;
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=1343485&r1=1343484&r2=1343485&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 May 29 04:13:04 2012
@@ -139,7 +139,7 @@ if (orderHeader) {
affiliateId = orderReadHelper.getAffiliateId();
context.affiliateId = affiliateId;
- billingAccount = orderHeader.getRelatedOne("BillingAccount");
+ billingAccount = orderHeader.getRelatedOne("BillingAccount", false);
context.billingAccount = billingAccount;
context.billingAccountMaxAmount = orderReadHelper.getBillingAccountMaxAmount();
@@ -153,7 +153,7 @@ if (orderHeader) {
itemIssuances = orderHeader.getRelated("ItemIssuance", null, ["shipmentId", "shipmentItemSeqId"]);
itemIssuances.each { itemIssuance ->
if (!allShipmentsMap.containsKey(itemIssuance.shipmentId)) {
- iiShipment = itemIssuance.getRelatedOne("Shipment");
+ iiShipment = itemIssuance.getRelatedOne("Shipment", false);
if (iiShipment) {
allShipmentsMap[iiShipment.shipmentId] = iiShipment;
}
@@ -205,7 +205,7 @@ if (orderHeader) {
statusChange = delegator.findByAnd("StatusValidChange", [statusId : orderHeader.statusId], null, false);
context.statusChange = statusChange;
- currentStatus = orderHeader.getRelatedOne("StatusItem");
+ currentStatus = orderHeader.getRelatedOne("StatusItem", false);
context.currentStatus = currentStatus;
orderHeaderStatuses = orderReadHelper.getOrderHeaderStatuses();
@@ -276,7 +276,7 @@ if (orderHeader) {
productStore = orderReadHelper.getProductStore();
context.productStore = productStore;
if (productStore) {
- facility = productStore.getRelatedOne("Facility");
+ facility = productStore.getRelatedOne("Facility", false);
inventorySummaryByFacility = dispatcher.runSync("getProductInventorySummaryForItems", [orderItems : orderItems, facilityId : facility.facilityId]);
context.availableToPromiseByFacilityMap = inventorySummaryByFacility.availableToPromiseMap;
context.quantityOnHandByFacilityMap = inventorySummaryByFacility.quantityOnHandMap;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy Tue May 29 04:13:04 2012
@@ -43,7 +43,7 @@ FastList expandProductGroup(product, qua
associations = EntityUtil.filterByDate(associations);
associations.each { association ->
line = FastMap.newInstance();
- line.product = association.getRelatedOne("AssocProduct");
+ line.product = association.getRelatedOne("AssocProduct", false);
// determine the quantities
quantityComposed = association.quantity ?: 0;
@@ -60,16 +60,16 @@ groupData = FastMap.newInstance();
shipGroups.each { shipGroup ->
data = FastMap.newInstance();
- address = shipGroup.getRelatedOne("PostalAddress");
+ address = shipGroup.getRelatedOne("PostalAddress", false);
data.address = address;
- phoneNumber = shipGroup.getRelatedOne("TelecomTelecomNumber");
+ phoneNumber = shipGroup.getRelatedOne("TelecomTelecomNumber", false);
data.phoneNumber = phoneNumber;
- carrierShipmentMethod = shipGroup.getRelatedOne("CarrierShipmentMethod");
+ carrierShipmentMethod = shipGroup.getRelatedOne("CarrierShipmentMethod", false);
if (carrierShipmentMethod) {
data.carrierShipmentMethod = carrierShipmentMethod;
- data.shipmentMethodType = carrierShipmentMethod.getRelatedOneCache("ShipmentMethodType");
+ data.shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType", true);
}
// the lines in a page, each line being a row of data to display
@@ -78,8 +78,8 @@ shipGroups.each { shipGroup ->
// process the order item to ship group associations, each being a line item for the group
orderItemAssocs = shipGroup.getRelated("OrderItemShipGroupAssoc", ["orderItemSeqId"]);
orderItemAssocs.each { orderItemAssoc ->
- orderItem = orderItemAssoc.getRelatedOne("OrderItem");
- product = orderItem.getRelatedOne("Product");
+ orderItem = orderItemAssoc.getRelatedOne("OrderItem", false);
+ product = orderItem.getRelatedOne("Product", false);
line = FastMap.newInstance();
// the quantity in group
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy Tue May 29 04:13:04 2012
@@ -23,7 +23,7 @@ import org.ofbiz.party.contact.ContactHe
if (party) {
address = EntityUtil.getFirst(ContactHelper.getContactMech(party, "GENERAL_LOCATION", "POSTAL_ADDRESS", false));
if (address) {
- toPostalAddress = address.getRelatedOne("PostalAddress");
+ toPostalAddress = address.getRelatedOne("PostalAddress", false);
context.toPostalAddress = toPostalAddress;
}
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy Tue May 29 04:13:04 2012
@@ -46,7 +46,7 @@ context.returnHeaders = returnHeaders;
// put in the return to party information from the order header
if (orderId) {
order = delegator.findOne("OrderHeader", [orderId : orderId], false);
- productStore = order.getRelatedOne("ProductStore");
+ productStore = order.getRelatedOne("ProductStore", false);
if (productStore) {
if (("VENDOR_RETURN").equals(returnHeaderTypeId)) {
context.partyId = productStore.payToPartyId;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy Tue May 29 04:13:04 2012
@@ -45,7 +45,7 @@ if (returnId) {
partyId = returnHeader.fromPartyId;
toPartyId = parameters.toPartyId;
- context.currentStatus = returnHeader.getRelatedOneCache("StatusItem");
+ context.currentStatus = returnHeader.getRelatedOne("StatusItem", true);
}
} else {
partyId = parameters.partyId;
@@ -54,7 +54,7 @@ if (returnId) {
returnHeaders.each { returnHeader ->
returnMap = [:];
returnMap.returnId = returnHeader.returnId;
- statusItem = returnHeader.getRelatedOne("StatusItem");
+ statusItem = returnHeader.getRelatedOne("StatusItem", false);
returnMap.statusId = statusItem.description;
returnMap.fromPartyId = returnHeader.fromPartyId;
returnMap.toPartyId = returnHeader.toPartyId;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl Tue May 29 04:13:04 2012
@@ -78,7 +78,7 @@ function submitForm(form, mode, value) {
<select name="shippingContactMechId" class="selectBox" onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA', null);">
<option value="">${uiLabelMap.OrderSelectShippingAddress}</option>
<#list shippingContactMechList as shippingContactMech>
- <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
<option value="${shippingAddress.contactMechId}" <#if (shippingAddress.contactMechId == selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
</#list>
</select>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl Tue May 29 04:13:04 2012
@@ -41,7 +41,7 @@ under the License.
<#if partyContactMechPurposes?exists>
<#list partyContactMechPurposes as partyContactMechPurpose>
- <#assign shippingAddress = partyContactMechPurpose.getRelatedOne("PostalAddress")/>
+ <#assign shippingAddress = partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
<#-- skip non-postal addresses -->
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Tue May 29 04:13:04 2012
@@ -100,7 +100,7 @@ function makeExpDate() {
<#if paymentMethodList?has_content>
<#list paymentMethodList as paymentMethod>
<#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
- <#assign creditCard = paymentMethod.getRelatedOne("CreditCard")>
+ <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
<tr>
<td width="1%">
<input type="radio" id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?exists && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
@@ -117,7 +117,7 @@ function makeExpDate() {
<td align="right"><a href="/partymgr/control/editcreditcard?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
</tr>
<#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">
- <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount")>
+ <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
<tr>
<td width="1%">
<input type="radio" id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?exists && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl Tue May 29 04:13:04 2012
@@ -25,7 +25,7 @@ under the License.
<#if productPromoCategoryIncludeList?has_content>
<div>${uiLabelMap.OrderPromotionProductsInCategories}:</div>
<#list productPromoCategoryIncludeList as productPromoCategory>
- <#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")>
+ <#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)>
<div>
- <a href="<@o...@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
<#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
@@ -35,7 +35,7 @@ under the License.
<#if productPromoCategoryExcludeList?has_content>
<div>${uiLabelMap.OrderExcludeCategories}</div>
<#list productPromoCategoryExcludeList as productPromoCategory>
- <#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")>
+ <#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)>
<div>
- <a href="<@o...@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
<#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
@@ -45,7 +45,7 @@ under the License.
<#if productPromoCategoryAlwaysList?has_content>
<div>${uiLabelMap.OrderAlwaysList}</div>
<#list productPromoCategoryAlwaysList as productPromoCategory>
- <#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")>
+ <#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)>
<div>
- <a href="<@o...@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
<#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Tue May 29 04:13:04 2012
@@ -305,7 +305,7 @@ under the License.
<td> </td>
</tr>
<#list shoppingCart.getAdjustments() as cartAdjustment>
- <#assign adjustmentType = cartAdjustment.getRelatedOneCache("OrderAdjustmentType")>
+ <#assign adjustmentType = cartAdjustment.getRelatedOne("OrderAdjustmentType", true)>
<tr>
<td colspan="4" nowrap="nowrap" align="right">
<div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl Tue May 29 04:13:04 2012
@@ -37,7 +37,7 @@ under the License.
<select name="SEARCH_CATEGORY_ID" size="1">
<option value="${searchCategoryId?if_exists}">${uiLabelMap.ProductEntireCatalog}</option>
<#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory>
- <#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOneCache("ProductCategory")>
+ <#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOne("ProductCategory", true)>
<#if searchProductCategory?exists>
<option value="${searchProductCategory.productCategoryId}">${searchProductCategory.description?default("No Description " + searchProductCategory.productCategoryId)}</option>
</#if>
@@ -61,7 +61,7 @@ under the License.
<select name="SEARCH_CATEGORY_ID" id="SEARCH_CATEGORY_ID" size="1">
<option value="${searchCategoryId?if_exists}">${uiLabelMap.ProductEntireCatalog}</option>
<#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory>
- <#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOneCache("ProductCategory")>
+ <#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOne("ProductCategory", true)>
<#if searchProductCategory?exists>
<option value="${searchProductCategory.productCategoryId}">${searchProductCategory.description?default("No Description " + searchProductCategory.productCategoryId)}</option>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Tue May 29 04:13:04 2012
@@ -386,32 +386,32 @@ ${virtualJavaScript?if_exists}
</div>
</#if>
<#if (product.quantityIncluded?exists && product.quantityIncluded?double != 0) || product.quantityUomId?has_content>
- <#assign quantityUom = product.getRelatedOneCache("QuantityUom")?if_exists/>
+ <#assign quantityUom = product.getRelatedOne("QuantityUom", true)?if_exists/>
<div>
${uiLabelMap.CommonQuantity}: ${product.quantityIncluded?if_exists} ${((quantityUom.abbreviation)?default(product.quantityUomId))?if_exists}
</div>
</#if>
<#if (product.weight?exists && product.weight?double != 0) || product.weightUomId?has_content>
- <#assign weightUom = product.getRelatedOneCache("WeightUom")?if_exists/>
+ <#assign weightUom = product.getRelatedOne("WeightUom", true)?if_exists/>
<div>
${uiLabelMap.CommonWeight}: ${product.weight?if_exists} ${((weightUom.abbreviation)?default(product.weightUomId))?if_exists}
</div>
</#if>
<#if (product.productHeight?exists && product.productHeight?double != 0) || product.heightUomId?has_content>
- <#assign heightUom = product.getRelatedOneCache("HeightUom")?if_exists/>
+ <#assign heightUom = product.getRelatedOne("HeightUom", true)?if_exists/>
<div>
${uiLabelMap.CommonHeight}: ${product.productHeight?if_exists} ${((heightUom.abbreviation)?default(product.heightUomId))?if_exists}
</div>
</#if>
<#if (product.productWidth?exists && product.productWidth?double != 0) || product.widthUomId?has_content>
- <#assign widthUom = product.getRelatedOneCache("WidthUom")?if_exists/>
+ <#assign widthUom = product.getRelatedOne("WidthUom", true)?if_exists/>
<div>
${uiLabelMap.CommonWidth}: ${product.productWidth?if_exists} ${((widthUom.abbreviation)?default(product.widthUomId))?if_exists}
</div>
</#if>
<#if (product.productDepth?exists && product.productDepth?double != 0) || product.depthUomId?has_content>
- <#assign depthUom = product.getRelatedOneCache("DepthUom")?if_exists/>
+ <#assign depthUom = product.getRelatedOne("DepthUom", true)?if_exists/>
<div>
${uiLabelMap.CommonDepth}: ${product.productDepth?if_exists} ${((depthUom.abbreviation)?default(product.depthUomId))?if_exists}
</div>
@@ -424,7 +424,7 @@ ${virtualJavaScript?if_exists}
<#if disFeatureList?exists && 0 < disFeatureList.size()>
<p> </p>
<#list disFeatureList as currentFeature>
- <#assign disFeatureType = currentFeature.getRelatedOneCache("ProductFeatureType")/>
+ <#assign disFeatureType = currentFeature.getRelatedOne("ProductFeatureType", true)/>
<div>
<#if disFeatureType.description?exists>${disFeatureType.get("description", locale)}<#else>${currentFeature.productFeatureTypeId}</#if>: ${currentFeature.description}
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Tue May 29 04:13:04 2012
@@ -65,7 +65,7 @@ under the License.
</div>
<div class="quickaddtable">
<#list productCategoryMembers as productCategoryMember>
- <#assign product = productCategoryMember.getRelatedOneCache("Product")>
+ <#assign product = productCategoryMember.getRelatedOne("Product", true)>
<p>
${setRequestAttribute("optProductId", productCategoryMember.productId)}
${screens.render(quickaddsummaryScreen)}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Tue May 29 04:13:04 2012
@@ -121,7 +121,7 @@ function submitForm(form, mode, value) {
<#if shippingContactMechList?has_content>
<tr><td colspan="2"><hr /></td></tr>
<#list shippingContactMechList as shippingContactMech>
- <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
<tr>
<td valign="top" width="1%">
<input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}" onclick="javascript:submitForm(document.checkoutInfoForm, 'SA', null);"<#if shoppingCart.getShippingContactMechId()?default("") == shippingAddress.contactMechId> checked="checked"</#if>/>
@@ -383,7 +383,7 @@ function submitForm(form, mode, value) {
<#list paymentMethodList as paymentMethod>
<#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
- <#assign creditCard = paymentMethod.getRelatedOne("CreditCard")>
+ <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
<tr>
<td width="1%">
<input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
@@ -398,7 +398,7 @@ function submitForm(form, mode, value) {
</#if>
<#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
- <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount")>
+ <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
<tr>
<td width="1%">
<input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
@@ -412,7 +412,7 @@ function submitForm(form, mode, value) {
</#if>
<#elseif paymentMethod.paymentMethodTypeId == "GIFT_CARD">
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
- <#assign giftCard = paymentMethod.getRelatedOne("GiftCard")>
+ <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)>
<#if giftCard?has_content && giftCard.cardNumber?has_content>
<#assign giftCardNumber = "">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Tue May 29 04:13:04 2012
@@ -74,7 +74,7 @@ function toggleBillingAccount(box) {
<#if shippingContactMechList?has_content>
<tr><td colspan="2"><hr /></td></tr>
<#list shippingContactMechList as shippingContactMech>
- <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
<#assign checkThisAddress = (shippingContactMech_index == 0 && !cart.getShippingContactMechId()?has_content) || (cart.getShippingContactMechId()?default("") == shippingAddress.contactMechId)/>
<tr>
<td valign="top" width="1%" nowrap="nowrap">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Tue May 29 04:13:04 2012
@@ -76,7 +76,7 @@ under the License.
<#assign index=0/>
<#list orderTerms as orderTerm>
<tr>
- <td width="35%"><div>${orderTerm.getRelatedOne("TermType").get("description",locale)}</div></td>
+ <td width="35%"><div>${orderTerm.getRelatedOne("TermType", false).get("description",locale)}</div></td>
<td width="10%"><div>${orderTerm.termValue?default("")}</div></td>
<td width="10%"><div>${orderTerm.termDays?default("")}</div></td>
<td width="45%"><div>${orderTerm.textValue?default("")}</div></td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Tue May 29 04:13:04 2012
@@ -37,7 +37,7 @@ under the License.
<td width="10%" align="right"><span><b>${uiLabelMap.OrderSubTotal}</b></span></td>
</tr>
<#list orderItems?if_exists as orderItem>
- <#assign itemType = orderItem.getRelatedOne("OrderItemType")?if_exists>
+ <#assign itemType = orderItem.getRelatedOne("OrderItemType", false)?if_exists>
<tr><td colspan="6"><hr /></td></tr>
<tr>
<#if orderItem.productId?exists && orderItem.productId == "_?_">
@@ -79,7 +79,7 @@ under the License.
<#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")?if_exists>
<#if WorkOrderItemFulfillments?has_content>
<#list WorkOrderItemFulfillments as WorkOrderItemFulfillment>
- <#assign workEffort = WorkOrderItemFulfillment.getRelatedOneCache("WorkEffort")?if_exists>
+ <#assign workEffort = WorkOrderItemFulfillment.getRelatedOne("WorkEffort", true)?if_exists>
<tr><td> </td><td> </td><td colspan="8"><div>${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNbrPersons}: ${workEffort.reservPersons}</div></td></tr>
<#break><#-- need only the first one -->
</#list>
@@ -97,12 +97,12 @@ under the License.
<#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>
<b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
</#if>
<#if orderItemAdjustment.secondaryGeoId?has_content>
- <#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/>
+ <#assign secondaryGeo = orderItemAdjustment.getRelatedOne("SecondaryGeo", true)/>
(<b>in:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}])
</#if>
</#if>
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?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Tue May 29 04:13:04 2012
@@ -65,7 +65,7 @@ standard order confirmation page and to
<td rowspan="${numberOfItems}">
<#assign contactMech = delegator.findOne("ContactMech", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", cartShipInfo.contactMechId), false)?if_exists />
<#if contactMech?has_content>
- <#assign address = contactMech.getRelatedOne("PostalAddress")?if_exists />
+ <#assign address = contactMech.getRelatedOne("PostalAddress", false)?if_exists />
</#if>
<#if address?exists>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl Tue May 29 04:13:04 2012
@@ -38,7 +38,7 @@ under the License.
</tr>
<#list orderTerms as orderTerm>
<tr <#if orderTerm_index % 2 != 0>class="alternate-row"</#if> >
- <td nowrap="nowrap">${orderTerm.getRelatedOne('TermType').get('description', locale)}</td>
+ <td nowrap="nowrap">${orderTerm.getRelatedOne('TermType', false).get('description', locale)}</td>
<td align="center">${orderTerm.termValue?if_exists}</td>
<td align="center">${orderTerm.termDays?if_exists}</td>
<td nowrap="nowrap">${orderTerm.textValue?if_exists}</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Tue May 29 04:13:04 2012
@@ -144,7 +144,7 @@ under the License.
<select name="${shipGroupIndex?default("0")}_shipGroupFacilityId">
<option value=""></option>
<#list productStoreFacilities as productStoreFacility>
- <#assign facility = productStoreFacility.getRelatedOne("Facility")>
+ <#assign facility = productStoreFacility.getRelatedOne("Facility", false)>
<option value="${productStoreFacility.facilityId}"<#if facilityId?exists><#if productStoreFacility.facilityId == facilityId> selected="selected"</#if></#if>>${facility.facilityName?if_exists} </option>
</#list>
</select>
@@ -155,7 +155,7 @@ under the License.
<tr><td colspan="3"><hr /></td></tr>
<#assign i = 0>
<#list shippingContactMechList as shippingContactMech>
- <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
<#if currShipContactMechId?exists && currShipContactMechId?has_content>
<#if currShipContactMechId == shippingContactMech.contactMechId>
<#assign checkedValue = "checked='checked'">
@@ -200,7 +200,7 @@ under the License.
<tr><td colspan="3">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr>
<tr><td colspan="3"><hr /></td></tr>
<#list shipToPartyShippingContactMechList as shippingContactMech>
- <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
<tr>
<td valign="top" width="1%" nowrap="nowrap">
<input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl Tue May 29 04:13:04 2012
@@ -44,14 +44,14 @@ under the License.
</tr>
<#assign alt_row = false>
<#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>
<#if billToParty?has_content>
<#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
<#assign billTo = billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/>
</#if>
- <#assign productStore = orderHeader.getRelatedOneCache("ProductStore")?if_exists />
+ <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)?if_exists />
<tr<#if alt_row> class="alternate-row"</#if>>
<#assign alt_row = !alt_row>
<td><a href="/ordermgr/control/orderview?orderId=${orderHeader.orderId}" class="buttontext">${orderHeader.orderId}</a></td>
@@ -66,7 +66,7 @@ under the License.
</#if>
</#list>
</td>
- <td>${orderHeader.getRelatedOneCache("StatusItem").get("description",locale)}</td>
+ <td>${orderHeader.getRelatedOne("StatusItem", true).get("description",locale)}</td>
</tr>
</#list>
</table>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl Tue May 29 04:13:04 2012
@@ -32,8 +32,8 @@ under the License.
<td width="50%">${uiLabelMap.PartyFirstName}</td>
</tr>
<#list salesReps as salesRep>
- <#assign party = salesRep.getRelatedOne("Party")?if_exists/>
- <#assign person = party.getRelatedOne("Person")?if_exists/>
+ <#assign party = salesRep.getRelatedOne("Party", false)?if_exists/>
+ <#assign person = party.getRelatedOne("Person", false)?if_exists/>
<#if person?exists && person?has_content>
<tr>
<td width="50%">${person.lastName}</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Tue May 29 04:13:04 2012
@@ -68,7 +68,7 @@ under the License.
<#assign orderItemContentWrapper = Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)>
<tr><td colspan="8"><hr /></td></tr>
<tr>
- <#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="8" valign="top">
@@ -93,7 +93,7 @@ under the License.
</#if>
<p>${uiLabelMap.ProductProduct} ${orderItemName}</p>
<#if productId?exists>
- <#assign product = orderItem.getRelatedOneCache("Product")>
+ <#assign product = orderItem.getRelatedOne("Product", true)>
<#if product.salesDiscontinuationDate?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)>
<span class="alert">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span>
</#if>
@@ -114,19 +114,19 @@ under the License.
</td>
<#-- now show status details per line item -->
- <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")>
+ <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem", false)>
<td>
${uiLabelMap.CommonCurrent} ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}<br />
<#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>${orderItemStatus.statusDatetime.toString()}</#if>
${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}<br />
</#list>
<#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">
<div class="alert">
<span class="label">${uiLabelMap.OrderReturned}</span> ${uiLabelMap.CommonNbr}<a href="<@o...@ofbizUrl>" class="buttontext">${returnItem.returnId}</a>
@@ -207,7 +207,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>
<td class="align-text" colspan="2">
<span class="label">${uiLabelMap.OrderAdjustment}</span> ${adjustmentType.get("description",locale)}
@@ -215,10 +215,10 @@ under the License.
<#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
<#if orderItemAdjustment.primaryGeoId?has_content>
- <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/>
+ <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/>
<span class="label">${uiLabelMap.OrderJurisdiction}</span> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
<#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>
@@ -242,8 +242,8 @@ under the License.
<#if orderItemShipGroupAssocs?has_content>
<tr><td colspan="8"> </td></tr>
<#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>
<td class="align-text" colspan="2">
<span class="label">${uiLabelMap.OrderShipGroup}</span> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}
@@ -277,12 +277,12 @@ under the License.
</form>
</#if>
<#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)>
<#assign orderAdjustmentId = orderHeaderAdjustment.get("orderAdjustmentId")>
<#assign productPromoCodeId = ''>
<#if adjustmentType.get("orderAdjustmentTypeId") == "PROMOTION_ADJUSTMENT" && orderHeaderAdjustment.get("productPromoId")?has_content>
- <#assign productPromo = orderHeaderAdjustment.getRelatedOne("ProductPromo")>
+ <#assign productPromo = orderHeaderAdjustment.getRelatedOne("ProductPromo", false)>
<#assign productPromoCodes = delegator.findByAnd("ProductPromoCode", {"productPromoId":productPromo.productPromoId}, null, false)>
<#assign orderProductPromoCode = ''>
<#list productPromoCodes as productPromoCode>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Tue May 29 04:13:04 2012
@@ -319,13 +319,13 @@ function toggleOrderIdList() {
<td align='left'>
<select name="shipmentMethod">
<#if currentCarrierShipmentMethod?has_content>
- <#assign currentShipmentMethodType = currentCarrierShipmentMethod.getRelatedOne("ShipmentMethodType")>
+ <#assign currentShipmentMethodType = currentCarrierShipmentMethod.getRelatedOne("ShipmentMethodType", false)>
<option value="${currentCarrierShipmentMethod.partyId}@${currentCarrierShipmentMethod.shipmentMethodTypeId}">${currentCarrierShipmentMethod.partyId?if_exists} ${currentShipmentMethodType.description?if_exists}</option>
<option value="${currentCarrierShipmentMethod.partyId}@${currentCarrierShipmentMethod.shipmentMethodTypeId}">---</option>
</#if>
<option value="">${uiLabelMap.OrderSelectShippingMethod}</option>
<#list carrierShipmentMethods as carrierShipmentMethod>
- <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType")>
+ <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType", false)>
<option value="${carrierShipmentMethod.partyId}@${carrierShipmentMethod.shipmentMethodTypeId}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.description?if_exists}</option>
</#list>
</select>
@@ -587,8 +587,8 @@ document.lookuporder.orderId.focus();
<#assign alt_row = false>
<#list orderList as orderHeader>
<#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)>
- <#assign statusItem = orderHeader.getRelatedOneCache("StatusItem")>
- <#assign orderType = orderHeader.getRelatedOneCache("OrderType")>
+ <#assign statusItem = orderHeader.getRelatedOne("StatusItem", true)>
+ <#assign orderType = orderHeader.getRelatedOne("OrderType", true)>
<#if orderType.orderTypeId == "PURCHASE_ORDER">
<#assign displayParty = orh.getSupplierAgent()?if_exists>
<#else>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Tue May 29 04:13:04 2012
@@ -43,7 +43,7 @@ under the License.
</fo:table-header>
<fo:table-body>
<#list orderItemList as orderItem>
- <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists>
+ <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)?if_exists>
<#assign productId = orderItem.productId?if_exists>
<#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))>
<#assign itemAdjustment = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false)>
@@ -99,7 +99,7 @@ under the License.
</#if>
</#list>
<#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>
<fo:table-row>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl Tue May 29 04:13:04 2012
@@ -35,7 +35,7 @@ under the License.
<#assign orderItemShipGroupAssocs = shipGroup.getRelated("OrderItemShipGroupAssoc")?if_exists>
<#if orderItemShipGroupAssocs?has_content>
<#list orderItemShipGroupAssocs as shipGroupAssoc>
- <#assign orderItem = shipGroupAssoc.getRelatedOne("OrderItem")?if_exists>
+ <#assign orderItem = shipGroupAssoc.getRelatedOne("OrderItem", false)?if_exists>
<fo:table-row>
<fo:table-cell><fo:block>${shipGroup.shipGroupSeqId}</fo:block></fo:table-cell>
<fo:table-cell><fo:block>${orderItem.productId?if_exists}</fo:block></fo:table-cell>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Tue May 29 04:13:04 2012
@@ -80,9 +80,9 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.AccountingPaymentInformation}:</fo:block>
<#list orderPaymentPreferences as orderPaymentPreference>
<fo:block text-indent="0.2in">
- <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")?if_exists>
+ <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType", false)?if_exists>
<#if (orderPaymentPreference?? && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
- <#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod").getRelatedOne("CreditCard")>
+ <#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod", false).getRelatedOne("CreditCard", false)>
${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
<#else>
${paymentMethodType.get("description",locale)?if_exists}
@@ -96,7 +96,7 @@ under the License.
<fo:block text-indent="0.2in">
<#if shipGroups.size() gt 1>${shipGroup.shipGroupSeqId} - </#if>
<#if (shipGroup.shipmentMethodTypeId)?exists>
- ${(shipGroup.getRelatedOne("ShipmentMethodType").get("description", locale))?default(shipGroup.shipmentMethodTypeId)}
+ ${(shipGroup.getRelatedOne("ShipmentMethodType", false).get("description", locale))?default(shipGroup.shipmentMethodTypeId)}
</#if>
<#if (shipGroup.shipAfterDate)?exists || (shipGroup.shipByDate)?exists>
<#if (shipGroup.shipAfterDate)?exists> - ${uiLabelMap.OrderShipAfterDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(shipGroup.shipAfterDate)}</#if><#if (shipGroup.shipByDate)?exists> - ${uiLabelMap.OrderShipBeforeDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(shipGroup.shipByDate)}</#if>
@@ -109,7 +109,7 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.OrderOrderTerms}:</fo:block>
<#list orderTerms as orderTerm>
<fo:block text-indent="0.2in">
- ${orderTerm.getRelatedOne("TermType").get("description",locale)} ${orderTerm.termValue?default("")} ${orderTerm.termDays?default("")} ${orderTerm.textValue?default("")}
+ ${orderTerm.getRelatedOne("TermType", false).get("description",locale)} ${orderTerm.termValue?default("")} ${orderTerm.termDays?default("")} ${orderTerm.textValue?default("")}
</fo:block>
</#list>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl Tue May 29 04:13:04 2012
@@ -23,7 +23,7 @@ under the License.
<fo:table-body>
<fo:table-row>
<fo:table-cell>
- <fo:block number-columns-spanned="2" font-weight="bold">${orderHeader.getRelatedOne("OrderType").get("description",locale)}</fo:block>
+ <fo:block number-columns-spanned="2" font-weight="bold">${orderHeader.getRelatedOne("OrderType", false).get("description",locale)}</fo:block>
</fo:table-cell>
</fo:table-row>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Tue May 29 04:13:04 2012
@@ -28,7 +28,7 @@ under the License.
<option value="${contactMechAddress.contactMechId}">${(contactMechAddress.address1)?default("")} - ${contactMechAddress.city?default("")}</option>
<option value="${contactMechAddress.contactMechId}"></option>
<#list contactMechList as contactMech>
- <#assign postalAddress = contactMech.getRelatedOne("PostalAddress")?if_exists />
+ <#assign postalAddress = contactMech.getRelatedOne("PostalAddress", false)?if_exists />
<#assign partyContactPurposes = postalAddress.getRelated("PartyContactMechPurpose")?if_exists />
<#list partyContactPurposes as partyContactPurpose>
<#if contactMech.contactMechId?has_content && partyContactPurpose.contactMechPurposeTypeId == contactMechPurposeTypeId>
@@ -40,7 +40,7 @@ under the License.
<option value="${contactMechAddress.contactMechId}">${contactMechAddress.countryCode?if_exists} <#if contactMechAddress.areaCode?exists>${contactMechAddress.areaCode}-</#if>${contactMechAddress.contactNumber}</option>
<option value="${contactMechAddress.contactMechId}"></option>
<#list contactMechList as contactMech>
- <#assign telecomNumber = contactMech.getRelatedOne("TelecomNumber")?if_exists />
+ <#assign telecomNumber = contactMech.getRelatedOne("TelecomNumber", false)?if_exists />
<#assign partyContactPurposes = telecomNumber.getRelated("PartyContactMechPurpose")?if_exists />
<#list partyContactPurposes as partyContactPurpose>
<#if contactMech.contactMechId?has_content && partyContactPurpose.contactMechPurposeTypeId == contactMechPurposeTypeId>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1343485&r1=1343484&r2=1343485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Tue May 29 04:13:04 2012
@@ -23,7 +23,7 @@ under the License.
<#if orderHeader.externalId?has_content>
<#assign externalOrder = "(" + orderHeader.externalId + ")"/>
</#if>
- <#assign orderType = orderHeader.getRelatedOne("OrderType")/>
+ <#assign orderType = orderHeader.getRelatedOne("OrderType", false)/>
<li class="h3"> ${orderType?if_exists.get("description", locale)?default(uiLabelMap.OrderOrder)} ${uiLabelMap.CommonNbr} <a href="<@o...@ofbizUrl>">${orderId}</a> ${externalOrder?if_exists} [ <a href="<@o...@ofbizUrl>" target="_blank">PDF</a> ]</li>
<#if currentStatus.statusId == "ORDER_APPROVED" && orderHeader.orderTypeId == "SALES_ORDER">
<li class="h3"><a href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a>
@@ -114,8 +114,8 @@ under the License.
<#if orderHeaderStatuses?has_content>
<hr />
<#list orderHeaderStatuses as orderHeaderStatus>
- <#assign loopStatusItem = orderHeaderStatus.getRelatedOne("StatusItem")>
- <#assign userlogin = orderHeaderStatus.getRelatedOne("UserLogin")>
+ <#assign loopStatusItem = orderHeaderStatus.getRelatedOne("StatusItem", false)>
+ <#assign userlogin = orderHeaderStatus.getRelatedOne("UserLogin", false)>
<div>
${loopStatusItem.get("description",locale)} <#if orderHeaderStatus.statusDatetime?has_content>- ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeaderStatus.statusDatetime, "", locale, timeZone)?default("0000-00-00 00:00:00")}</#if>
@@ -151,7 +151,7 @@ under the License.
<td width="5%"> </td>
<td valign="top" width="80%">
<#if orderHeader.salesChannelEnumId?has_content>
- <#assign channel = orderHeader.getRelatedOne("SalesChannelEnumeration")>
+ <#assign channel = orderHeader.getRelatedOne("SalesChannelEnumeration", false)>
${(channel.get("description",locale))?default("N/A")}
<#else>
${uiLabelMap.CommonNA}