You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/06/19 23:36:33 UTC
svn commit: r1351866 [21/48] - in /ofbiz/branches/20120329_portletWidget: ./
applications/accounting/ applications/accounting/config/
applications/accounting/data/ applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/i...
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy Tue Jun 19 21:36:11 2012
@@ -126,19 +126,19 @@ if (product) {
}
// get the product review(s)
- reviews = product.getRelatedCache("ProductReview", null, ["-postedDateTime"]);
+ reviews = product.getRelated("ProductReview", null, ["-postedDateTime"], true);
// get product variant for Box/Case/Each
productVariants = [];
boolean isAlternativePacking = ProductWorker.isAlternativePacking(delegator, product.productId, null);
mainProducts = [];
if(isAlternativePacking){
- productVirtualVariants = delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productIdTo", product.productId , "productAssocTypeId", "ALTERNATIVE_PACKAGE"), true);
+ productVirtualVariants = delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productIdTo", product.productId , "productAssocTypeId", "ALTERNATIVE_PACKAGE"), null, true);
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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy Tue Jun 19 21:36:11 2012
@@ -27,7 +27,7 @@ productId = request.getParameter("produc
if (productId != null) {
product = delegator.findOne("Product", [productId : productId], false);
- prodAssocs = product.getRelated("MainProductAssoc");
+ prodAssocs = product.getRelated("MainProductAssoc", null, null, false);
if (UtilValidate.isNotEmpty(prodAssocs)) {
products = EntityUtil.filterByAnd(prodAssocs, [EntityCondition.makeCondition("productAssocTypeId", EntityOperator.NOT_EQUAL, "PRODUCT_VARIANT")]);
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Tue Jun 19 21:36:11 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;
}
@@ -82,7 +82,7 @@ if (orderHeader) {
if (billToParty) {
partyId = billToParty.partyId;
} else {
- def billToCustomer = EntityUtil.getFirst(orderHeader.getRelatedByAnd("OrderRole", [roleTypeId : "BILL_TO_CUSTOMER"]));
+ def billToCustomer = EntityUtil.getFirst(orderHeader.getRelated("OrderRole", [roleTypeId : "BILL_TO_CUSTOMER"], null, false));
if (billToCustomer) {
partyId = billToCustomer.partyId;
}
@@ -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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/FilterOrderList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/FilterOrderList.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/FilterOrderList.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/FilterOrderList.groovy Tue Jun 19 21:36:11 2012
@@ -51,7 +51,6 @@ if ((state.hasFilter("filterPartiallyRec
state.hasFilter("filterPOsWithRejectedItems")) &&
orderHeaderList) {
orderHeaderList.each { orderHeader ->
- facilityId = orderHeader.originFacilityId ?: productStore.inventoryFacilityId;
orderReadHelper = OrderReadHelper.getHelper(orderHeader);
if ("PURCHASE_ORDER".equals(orderHeader.orderTypeId)) {
if (orderReadHelper.getRejectedOrderItems() &&
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Tue Jun 19 21:36:11 2012
@@ -70,7 +70,7 @@ if (orderHeader) {
orderAdjustments = orderReadHelper.getAdjustments();
orderHeaderAdjustments = orderReadHelper.getOrderHeaderAdjustments();
orderSubTotal = orderReadHelper.getOrderItemsSubTotal();
- orderTerms = orderHeader.getRelated("OrderTerm");
+ orderTerms = orderHeader.getRelated("OrderTerm", null, null, false);
context.orderHeader = orderHeader;
context.orderReadHelper = orderReadHelper;
@@ -82,7 +82,7 @@ if (orderHeader) {
context.orderTerms = orderTerms;
// get sales reps
- context.salesReps = orderHeader.getRelated("OrderRole", [orderId : orderHeader.orderId, roleTypeId : "SALES_REP"], null);
+ context.salesReps = orderHeader.getRelated("OrderRole", [orderId : orderHeader.orderId, roleTypeId : "SALES_REP"], null, false);
// get the order type
orderType = orderHeader.orderTypeId;
@@ -139,21 +139,21 @@ if (orderHeader) {
affiliateId = orderReadHelper.getAffiliateId();
context.affiliateId = affiliateId;
- billingAccount = orderHeader.getRelatedOne("BillingAccount");
+ billingAccount = orderHeader.getRelatedOne("BillingAccount", false);
context.billingAccount = billingAccount;
context.billingAccountMaxAmount = orderReadHelper.getBillingAccountMaxAmount();
// get a list of all shipments, and a list of ItemIssuances per order item
allShipmentsMap = [:];
- primaryShipments = orderHeader.getRelated("PrimaryShipment");
+ primaryShipments = orderHeader.getRelated("PrimaryShipment", null, null, false);
primaryShipments.each { primaryShipment ->
allShipmentsMap[primaryShipment.shipmentId] = primaryShipment;
}
itemIssuancesPerItem = [:];
- itemIssuances = orderHeader.getRelated("ItemIssuance", null, ["shipmentId", "shipmentItemSeqId"]);
+ itemIssuances = orderHeader.getRelated("ItemIssuance", null, ["shipmentId", "shipmentItemSeqId"], false);
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;
@@ -388,7 +388,7 @@ if (workEffortId && assignPartyId && ass
actFields = [packageId : workEffort.workflowPackageId, packageVersion : workEffort.workflowPackageVersion, processId : workEffort.workflowProcessId, processVersion : workEffort.workflowProcessVersion, activityId : workEffort.workflowActivityId];
activity = delegator.findOne("WorkflowActivity", actFields, false);
if (activity) {
- transitions = activity.getRelated("FromWorkflowTransition", null, ["-transitionId"]);
+ transitions = activity.getRelated("FromWorkflowTransition", null, ["-transitionId"], false);
context.wfTransitions = transitions;
}
}
@@ -477,7 +477,7 @@ if (orderItems) {
carrierShipmentMethod = EntityUtil.getFirst(delegator.findByAnd("CarrierShipmentMethod", [partyId : "UPS", carrierServiceCode : serviceCode], null, false));
shipmentMethodTypeId = carrierShipmentMethod.shipmentMethodTypeId;
rate = shippingRate.get(serviceCode);
- shipmentMethodDescription = EntityUtil.getFirst(carrierShipmentMethod.getRelated("ShipmentMethodType")).description;
+ shipmentMethodDescription = EntityUtil.getFirst(carrierShipmentMethod.getRelated("ShipmentMethodType", null, null, false)).description;
shippingMethodAndRate.shipmentMethodTypeId = carrierShipmentMethod.shipmentMethodTypeId;
shippingMethodAndRate.rate = rate;
shippingMethodAndRate.shipmentMethodDescription = shipmentMethodDescription;
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy Tue Jun 19 21:36:11 2012
@@ -35,14 +35,14 @@ if (orderHeader) {
hasPermission = true;
canViewInternalDetails = true;
} else if (security.hasEntityPermission("ORDERMGR_ROLE", "_VIEW", session)) {
- currentUserOrderRoles = orderHeader.getRelated("OrderRole", [partyId : userLogin.partyId], null);
+ currentUserOrderRoles = orderHeader.getRelated("OrderRole", [partyId : userLogin.partyId], null, false);
if (currentUserOrderRoles) {
hasPermission = true;
canViewInternalDetails = true;
}
} else {
// regardless of permission, allow if this is the supplier
- currentUserSupplierOrderRoles = orderHeader.getRelated("OrderRole", [partyId : userLogin.partyId, roleTypeId : "SUPPLIER_AGENT"], null);
+ currentUserSupplierOrderRoles = orderHeader.getRelated("OrderRole", [partyId : userLogin.partyId, roleTypeId : "SUPPLIER_AGENT"], null, false);
if (currentUserSupplierOrderRoles) {
hasPermission = true;
}
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy Tue Jun 19 21:36:11 2012
@@ -39,11 +39,11 @@ context.shipGroups = shipGroups;
// method to expand the marketing packages
FastList expandProductGroup(product, quantityInGroup, quantityShipped, quantityOpen, assocType) {
sublines = FastList.newInstance();
- associations = product.getRelatedByAnd("MainProductAssoc", [productAssocTypeId : assocType]);
+ associations = product.getRelated("MainProductAssoc", [productAssocTypeId : assocType], null, false);
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,26 +60,26 @@ 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
lines = FastList.newInstance();
// process the order item to ship group associations, each being a line item for the group
- orderItemAssocs = shipGroup.getRelated("OrderItemShipGroupAssoc", ["orderItemSeqId"]);
+ orderItemAssocs = shipGroup.getRelated("OrderItemShipGroupAssoc", null, ["orderItemSeqId"], false);
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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/request/GetNextSequenceNum.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/request/GetNextSequenceNum.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/request/GetNextSequenceNum.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/request/GetNextSequenceNum.groovy Tue Jun 19 21:36:11 2012
@@ -23,7 +23,7 @@ import org.ofbiz.entity.GenericValue;
long nextSequenceNum = 10;
if (!custRequestItem && custRequest) {
- items = custRequest.getRelated("CustRequestItem", ["-sequenceNum"]);
+ items = custRequest.getRelated("CustRequestItem", null, ["-sequenceNum"], false);
lastItem = EntityUtil.getFirst(items);
if (lastItem?.sequenceNum) {
lastSequenceNum = lastItem.sequenceNum;
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy Tue Jun 19 21:36:11 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;
Added: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl?rev=1351866&view=auto
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl (added)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl Tue Jun 19 21:36:11 2012
@@ -0,0 +1,263 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<script language="javascript" type="text/javascript">
+//<![CDATA[
+function submitForm(form, mode, value) {
+ if (mode == "DN") {
+ // done action; payment info
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "CS") {
+ // continue shopping
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "NA") {
+ // new address
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "SV") {
+ // save option; return to current screen
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "SA") {
+ // selected shipping address
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ }
+}
+//]]>
+</script>
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderItemGroups}</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" cellspacing="0" cellpadding="1" border="0">
+ <#assign shipGroups = cart.getShipGroups()>
+ <#if (shipGroups.size() > 0)>
+ <#assign groupIdx = 0>
+ <#list shipGroups as group>
+ <#assign shipEstimateWrapper = Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher, cart, groupIdx)>
+ <#assign carrierShipmentMethods = shipEstimateWrapper.getShippingMethods()>
+ <#assign groupNumber = groupIdx + 1>
+ <form method="post" action="#" name="editgroupform${groupIdx}" style="margin: 0;">
+ <input type="hidden" name="groupIndex" value="${groupIdx}"/>
+ <tr>
+ <td>
+ <div class="tabletext"><b>${uiLabelMap.CommonGroup} ${groupNumber}:</b></div>
+ <#list group.getShipItems() as item>
+ <#assign groupItem = group.getShipItemInfo(item)>
+ <div class="tabletext"> ${item.getName()} - (${groupItem.getItemQuantity()})</div>
+ </#list>
+ </td>
+ <td>
+ <div>
+ <span class='tabletext'>${uiLabelMap.CommonAdd}:</span>
+ <a href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA', '');" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
+ </div>
+ <div>
+ <#assign selectedContactMechId = cart.getShippingContactMechId(groupIdx)?default("")>
+ <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", false)>
+ <option value="${shippingAddress.contactMechId}" <#if (shippingAddress.contactMechId == selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
+ </#list>
+ </select>
+ </div>
+ <#if cart.getShipmentMethodTypeId(groupIdx)?exists>
+ <#assign selectedShippingMethod = cart.getShipmentMethodTypeId(groupIdx) + "@" + cart.getCarrierPartyId(groupIdx)>
+ <#else>
+ <#assign selectedShippingMethod = "">
+ </#if>
+ <select name="shipmentMethodString" class="selectBox">
+ <option value="">${uiLabelMap.OrderSelectShippingMethod}</option>
+ <#list carrierShipmentMethods as carrierShipmentMethod>
+ <#assign shippingEst = shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
+ <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
+ <option value="${shippingMethod}" <#if (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
+ <#if carrierShipmentMethod.partyId != "_NA_">
+ ${carrierShipmentMethod.partyId?if_exists}
+ </#if>
+ ${carrierShipmentMethod.description?if_exists}
+ <#if shippingEst?has_content>
+ -
+ <#if (shippingEst > -1)>
+ <@ofbizCurrency amount=shippingEst isoCode=cart.getCurrency()/>
+ <#else>
+ ${uiLabelMap.OrderCalculatedOffline}
+ </#if>
+ </#if>
+ </option>
+ </#list>
+ </select>
+
+ <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
+ <textarea class='textAreaBox' cols="35" rows="3" wrap="hard" name="shippingInstructions">${cart.getShippingInstructions(groupIdx)?if_exists}</textarea>
+ </td>
+ <td>
+ <div>
+ <select name="maySplit" class="selectBox">
+ <#assign maySplitStr = cart.getMaySplit(groupIdx)?default("")>
+ <option value="">${uiLabelMap.OrderSplittingPreference}</option>
+ <option value="false" <#if maySplitStr == "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
+ <option value="true" <#if maySplitStr == "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
+ </select>
+ </div>
+ <div>
+ <select name="isGift" class="selectBox">
+ <#assign isGiftStr = cart.getIsGift(groupIdx)?default("")>
+ <option value="">${uiLabelMap.OrderIsGift} ?</option>
+ <option value="false" <#if isGiftStr == "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
+ <option value="true" <#if isGiftStr == "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
+ </select>
+ </div>
+
+ <h2>${uiLabelMap.OrderGiftMessage}</h2>
+ <textarea class='textAreaBox' cols="30" rows="3" wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)?if_exists}</textarea>
+ </td>
+ <td><input type="button" class="smallSubmit" value="${uiLabelMap.CommonSave}" onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV', null);"/></td>
+ </tr>
+ <#assign groupIdx = groupIdx + 1>
+ <#if group_has_next>
+ <tr>
+ <td colspan="6"><hr /></td>
+ </tr>
+ </#if>
+ </form>
+ </#list>
+ <#else>
+ <div class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
+ </#if>
+ </table>
+ </div>
+</div>
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderAssignItems}</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" cellspacing="0" cellpadding="1" border="0">
+ <tr>
+ <td><div class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
+ <td align="center"><div class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
+ <td> </td>
+ <td align="center"><div class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
+ <td> </td>
+ <td> </td>
+ </tr>
+
+ <#list cart.items() as cartLine>
+ <#assign cartLineIndex = cart.getItemIndex(cartLine)>
+ <tr>
+ <form method="post" action="<@o...@ofbizUrl>" name="editgroupform" style="margin: 0;">
+ <input type="hidden" name="itemIndex" value="${cartLineIndex}"/>
+ <td>
+ <div class="tabletext">
+ <#if cartLine.getProductId()?exists>
+ <#-- product item -->
+ <#-- start code to display a small image of the product -->
+ <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
+ <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
+ <#if smallImageUrl?string?has_content>
+ <a href="<@o...@ofbizUrl>">
+ <img src="<@o...@ofbizContentUrl>" class="cssImgSmall" alt="" />
+ </a>
+ </#if>
+ <#-- end code to display a small image of the product -->
+ <a href="<@o...@ofbizUrl>" class="buttontext">${cartLine.getProductId()} -
+ ${cartLine.getName()?if_exists}</a> : ${cartLine.getDescription()?if_exists}
+
+ <#-- display the registered ship groups and quantity -->
+ <#assign itemShipGroups = cart.getShipGroups(cartLine)>
+ <#list itemShipGroups.entrySet() as group>
+ <div class="tabletext">
+ <#assign groupNumber = group.getKey() + 1>
+ <b>Group - </b>${groupNumber} / <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
+ </div>
+ </#list>
+
+ <#-- if inventory is not required check to see if it is out of stock and needs to have a message shown about that... -->
+ <#assign itemProduct = cartLine.getProduct()>
+ <#assign isStoreInventoryNotRequiredAndNotAvailable = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request, itemProduct, cartLine.getQuantity(), false, false)>
+ <#if isStoreInventoryNotRequiredAndNotAvailable && itemProduct.inventoryMessage?has_content>
+ <b>(${itemProduct.inventoryMessage})</b>
+ </#if>
+
+ <#else>
+ <#-- this is a non-product item -->
+ <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists}
+ </#if>
+ </div>
+
+ </td>
+ <td align="right">
+ <div class="tabletext">${cartLine.getQuantity()?string.number} </div>
+ </td>
+ <td>
+ <div> </div>
+ </td>
+ <td align="center">
+ <input size="6" class="inputBox" type="text" name="quantity" value="${cartLine.getQuantity()?string.number}"/>
+ </td>
+ <td>
+ <div> </div>
+ </td>
+ <td>
+ <div class="tabletext">${uiLabelMap.CommonFrom}:
+ <select name="fromGroupIndex" class="selectBox">
+ <#list itemShipGroups.entrySet() as group>
+ <#assign groupNumber = group.getKey() + 1>
+ <option value="${group.getKey()}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ <td>
+ <div class="tabletext">${uiLabelMap.CommonTo}:
+ <select name="toGroupIndex" class="selectBox">
+ <#list 0..(cart.getShipGroupSize() - 1) as groupIdx>
+ <#assign groupNumber = groupIdx + 1>
+ <option value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
+ </#list>
+ <option value="-1">${uiLabelMap.CommonNew} ${uiLabelMap.CommonGroup}</option>
+ </select>
+ </div>
+ </td>
+ <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonSubmit}"/></td>
+ </form>
+ </tr>
+ </#list>
+ </table>
+ </div>
+</div>
+
+<table>
+ <tr valign="top">
+ <td>
+ <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
+ </td>
+ <td align="right">
+ <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.CommonContinue}</a>
+ </td>
+ </tr>
+</table>
Propchange: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/addrsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/addrsettings.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/addrsettings.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/addrsettings.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/billsettings.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Tue Jun 19 21:36:11 2012
@@ -212,8 +212,7 @@ under the License.
<#-- Show Associated Products (not for Variants) -->
<#if cartLine.getProductId()?exists>
- <#assign itemProductAssocList = cartLine.getProduct().getRelated("MainProductAssoc",
- Static["org.ofbiz.base.util.UtilMisc"].toList("productAssocTypeId", "sequenceNum"))?if_exists/>
+ <#assign itemProductAssocList = cartLine.getProduct().getRelated("MainProductAssoc", null, Static["org.ofbiz.base.util.UtilMisc"].toList("productAssocTypeId", "sequenceNum"), false)?if_exists/>
</#if>
<#if itemProductAssocList?exists && itemProductAssocList?has_content>
<tr><td colspan="8"><hr /></td></tr>
@@ -306,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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Tue Jun 19 21:36:11 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 == "_?_">
@@ -76,10 +76,10 @@ under the License.
</tr>
<#-- show info from workeffort if it was a rental item -->
<#if orderItem.orderItemTypeId?exists && orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM">
- <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")?if_exists>
+ <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)?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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/orderterms.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/orderterms.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/orderterms.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/orderterms.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/shipsettings.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/OrderListByDate.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/OrderListByDate.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/OrderListByDate.ftl Tue Jun 19 21:36:11 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>
@@ -59,14 +59,14 @@ under the License.
<td><#if productStore?has_content>${productStore.storeName?default(productStore.productStoreId)}</#if></td>
<td><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom/></td>
<td>
- <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder")>
+ <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder", null, null, false)>
<#list trackingCodes as trackingCode>
<#if trackingCode?has_content>
<a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br />
</#if>
</#list>
</td>
- <td>${orderHeader.getRelatedOneCache("StatusItem").get("description",locale)}</td>
+ <td>${orderHeader.getRelatedOne("StatusItem", true).get("description",locale)}</td>
</tr>
</#list>
</table>
@@ -74,4 +74,4 @@ under the License.
<h3>${uiLabelMap.OrderNoOrderFound}</h3>
</#if>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl Tue Jun 19 21:36:11 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>
@@ -44,4 +44,4 @@ under the License.
</table>
</div>
</div>
-</#if>
\ No newline at end of file
+</#if>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/editorderitems.ftl Tue Jun 19 21:36:11 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>
+ <#assign returns = orderItem.getRelated("ReturnItem", null, null, false)?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>
@@ -238,12 +238,12 @@ under the License.
</#if>
<#-- now show ship group info per line item -->
- <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc")?if_exists>
+ <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc", null, null, false)?if_exists>
<#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/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/findOrders.ftl Tue Jun 19 21:36:11 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>