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 [30/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/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy Tue Jun 19 21:36:11 2012
@@ -29,17 +29,17 @@ context.shipmentId = shipmentId;
context.shipment = shipment;
if (shipment) {
- context.shipmentType = shipment.getRelatedOne("ShipmentType");
- context.statusItem = shipment.getRelatedOne("StatusItem");
- context.primaryOrderHeader = shipment.getRelatedOne("PrimaryOrderHeader");
- context.toPerson = shipment.getRelatedOne("ToPerson");
- context.toPartyGroup = shipment.getRelatedOne("ToPartyGroup");
- context.fromPerson = shipment.getRelatedOne("FromPerson");
- context.fromPartyGroup = shipment.getRelatedOne("FromPartyGroup");
- context.originFacility = shipment.getRelatedOne("OriginFacility");
- context.destinationFacility = shipment.getRelatedOne("DestinationFacility");
- context.originPostalAddress = shipment.getRelatedOne("OriginPostalAddress");
- context.destinationPostalAddress = shipment.getRelatedOne("DestinationPostalAddress");
+ context.shipmentType = shipment.getRelatedOne("ShipmentType", false);
+ context.statusItem = shipment.getRelatedOne("StatusItem", false);
+ context.primaryOrderHeader = shipment.getRelatedOne("PrimaryOrderHeader", false);
+ context.toPerson = shipment.getRelatedOne("ToPerson", false);
+ context.toPartyGroup = shipment.getRelatedOne("ToPartyGroup", false);
+ context.fromPerson = shipment.getRelatedOne("FromPerson", false);
+ context.fromPartyGroup = shipment.getRelatedOne("FromPartyGroup", false);
+ context.originFacility = shipment.getRelatedOne("OriginFacility", false);
+ context.destinationFacility = shipment.getRelatedOne("DestinationFacility", false);
+ context.originPostalAddress = shipment.getRelatedOne("OriginPostalAddress", false);
+ context.destinationPostalAddress = shipment.getRelatedOne("DestinationPostalAddress", false);
}
// check permission
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/EditContactMech.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/EditContactMech.ftl Tue Jun 19 21:36:11 2012
@@ -92,7 +92,7 @@ under the License.
<#if mechMap.facilityContactMechPurposes?has_content>
<#assign alt_row = false>
<#list mechMap.facilityContactMechPurposes as facilityContactMechPurpose>
- <#assign contactMechPurposeType = facilityContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
+ <#assign contactMechPurposeType = facilityContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td>
<#if contactMechPurposeType?has_content>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/EditFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Tue Jun 19 21:36:11 2012
@@ -56,7 +56,7 @@ under the License.
<td>
<select name="locationTypeEnumId">
<#if (facilityLocation.locationTypeEnumId)?has_content>
- <#assign locationTypeEnum = facilityLocation.getRelatedOneCache("TypeEnumeration")?if_exists>
+ <#assign locationTypeEnum = facilityLocation.getRelatedOne("TypeEnumeration", true)?if_exists>
<option value="${facilityLocation.locationTypeEnumId}">${(locationTypeEnum.get("description",locale))?default(facilityLocation.locationTypeEnumId)}</option>
<option value="${facilityLocation.locationTypeEnumId}">----</option>
</#if>
@@ -110,7 +110,7 @@ under the License.
<td>${uiLabelMap.ProductMinimumStockAndMoveQuantity}</td>
</tr>
<#list productFacilityLocations?if_exists as productFacilityLocation>
- <#assign product = productFacilityLocation.getRelatedOne("Product")?if_exists>
+ <#assign product = productFacilityLocation.getRelatedOne("Product", false)?if_exists>
<tr>
<td><#if product?exists>${(product.internalName)?if_exists}</#if>[${productFacilityLocation.productId}]</td>
<td>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Tue Jun 19 21:36:11 2012
@@ -90,7 +90,7 @@ under the License.
</tr>
<#assign rowClass = "2">
<#list foundLocations as location>
- <#assign locationTypeEnum = location.getRelatedOneCache("TypeEnumeration")?if_exists>
+ <#assign locationTypeEnum = location.getRelatedOne("TypeEnumeration", true)?if_exists>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>">${(location.facilityId)?if_exists}</a></td>
<td><a href="<@o...@ofbizUrl>">${(location.locationSeqId)?if_exists}</a></td>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PickMoveStock.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PickMoveStock.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PickMoveStock.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PickMoveStock.ftl Tue Jun 19 21:36:11 2012
@@ -67,10 +67,10 @@ under the License.
<#list moveByOisgirInfoList?if_exists as moveByOisgirInfo>
<#assign product = moveByOisgirInfo.product>
<#assign facilityLocationFrom = moveByOisgirInfo.facilityLocationFrom>
- <#assign facilityLocationTypeEnumFrom = (facilityLocationFrom.getRelatedOneCache("TypeEnumeration"))?if_exists>
+ <#assign facilityLocationTypeEnumFrom = (facilityLocationFrom.getRelatedOne("TypeEnumeration", true))?if_exists>
<#assign facilityLocationTo = moveByOisgirInfo.facilityLocationTo>
<#assign targetProductFacilityLocation = moveByOisgirInfo.targetProductFacilityLocation>
- <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOneCache("TypeEnumeration"))?if_exists>
+ <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOne("TypeEnumeration", true))?if_exists>
<#assign totalQuantity = moveByOisgirInfo.totalQuantity>
<tr id="moveInfoId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td>${product.productId}</td>
@@ -101,10 +101,10 @@ under the License.
<#list moveByPflInfoList?if_exists as moveByPflInfo>
<#assign product = moveByPflInfo.product>
<#assign facilityLocationFrom = moveByPflInfo.facilityLocationFrom>
- <#assign facilityLocationTypeEnumFrom = (facilityLocationFrom.getRelatedOneCache("TypeEnumeration"))?if_exists>
+ <#assign facilityLocationTypeEnumFrom = (facilityLocationFrom.getRelatedOne("TypeEnumeration", true))?if_exists>
<#assign facilityLocationTo = moveByPflInfo.facilityLocationTo>
<#assign targetProductFacilityLocation = moveByPflInfo.targetProductFacilityLocation>
- <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOneCache("TypeEnumeration"))?if_exists>
+ <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOne("TypeEnumeration", true))?if_exists>
<#assign totalQuantity = moveByPflInfo.totalQuantity>
<tr id="moveInfoId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td>${product.productId}</td>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/Picklist.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/Picklist.fo.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/Picklist.fo.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/Picklist.fo.ftl Tue Jun 19 21:36:11 2012
@@ -241,7 +241,7 @@ under the License.
<#assign picklistItem = picklistItemInfo.picklistItem>
<#assign orderItem = picklistItemInfo.orderItem>
<#assign product = picklistItemInfo.product>
- <#assign picklistItemProduct = picklistItemInfo.inventoryItemAndLocation.getRelatedOne("InventoryItem").getRelatedOne("Product")>
+ <#assign picklistItemProduct = picklistItemInfo.inventoryItemAndLocation.getRelatedOne("InventoryItem", false).getRelatedOne("Product", false)>
<#assign orderItemShipGrpInvRes = picklistItemInfo.orderItemShipGrpInvRes?if_exists>
<fo:table-row>
<fo:table-cell padding="2pt" background-color="${rowColor}">
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PicklistManage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PicklistManage.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PicklistManage.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PicklistManage.ftl Tue Jun 19 21:36:11 2012
@@ -113,7 +113,7 @@ under the License.
<span class="label">${uiLabelMap.PageTitlePickList}</span>
<select name="picklistId">
<#list picklistActiveList as picklistActive>
- <#assign picklistActiveStatusItem = picklistActive.getRelatedOneCache("StatusItem")>
+ <#assign picklistActiveStatusItem = picklistActive.getRelatedOne("StatusItem", true)>
<option value="${picklistActive.picklistId}"<#if picklistActive.picklistId == picklist.picklistId> selected="selected"</#if>>${picklistActive.picklistId} [${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.get("description",locale)}]</option>
</#list>
</select>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PicklistOptions.ftl Tue Jun 19 21:36:11 2012
@@ -268,10 +268,10 @@ under the License.
<#list toPickList as toPick>
<#assign oiasgal = toPick.orderItemShipGrpInvResList>
<#assign header = toPick.orderHeader>
- <#assign channel = header.getRelatedOne("SalesChannelEnumeration")?if_exists>
+ <#assign channel = header.getRelatedOne("SalesChannelEnumeration", false)?if_exists>
<#list oiasgal as oiasga>
- <#assign orderProduct = oiasga.getRelatedOne("OrderItem").getRelatedOne("Product")?if_exists>
- <#assign product = oiasga.getRelatedOne("InventoryItem").getRelatedOne("Product")?if_exists>
+ <#assign orderProduct = oiasga.getRelatedOne("OrderItem", false).getRelatedOne("Product", false)?if_exists>
+ <#assign product = oiasga.getRelatedOne("InventoryItem", false).getRelatedOne("Product", false)?if_exists>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${externalKeyParam}" class="buttontext" target="_blank">${oiasga.orderId}</a></td>
<td>${header.orderDate?string}</td>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl Tue Jun 19 21:36:11 2012
@@ -165,9 +165,9 @@ under the License.
<#if orderItemShipGrpInvRes.quantityNotAvailable?exists >
<#assign quantityToPick = quantityToPick - Static["java.lang.Integer"].parseInt("${orderItemShipGrpInvRes.quantityNotAvailable}")>
</#if>
- <#assign orderItem = orderItemShipGrpInvRes.getRelatedOne("OrderItem")>
- <#assign product = orderItem.getRelatedOne("Product")>
- <#assign supplierProduct = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(product.getRelated("SupplierProduct"))?if_exists>
+ <#assign orderItem = orderItemShipGrpInvRes.getRelatedOne("OrderItem", false)>
+ <#assign product = orderItem.getRelatedOne("Product", false)>
+ <#assign supplierProduct = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(product.getRelated("SupplierProduct", null, null, false))?if_exists>
<#assign inventoryItem = infoItem.inventoryItem>
<#if (quantityToPick > 0)>
<fo:table-row background-color="${rowColor}">
@@ -197,19 +197,19 @@ under the License.
</fo:block>
</fo:table-cell>
</fo:table-row>
- <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")>
+ <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)>
<#if workOrderItemFulfillments?has_content>
<#assign workOrderItemFulfillment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(workOrderItemFulfillments)/>
<#if workOrderItemFulfillment?has_content>
- <#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort")/>
+ <#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort", false)/>
<#if workEffort?has_content>
<#assign workEffortTask = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("WorkEffort", {"workEffortParentId" : workEffort.workEffortId}, null, false))/>
<#if workEffortTask?has_content>
- <#assign workEffortInventoryAssigns = workEffortTask.getRelated("WorkEffortInventoryAssign")/>
+ <#assign workEffortInventoryAssigns = workEffortTask.getRelated("WorkEffortInventoryAssign", null, null, false)/>
<#if workEffortInventoryAssigns?has_content>
<#list workEffortInventoryAssigns as workEffortInventoryAssign>
- <#assign inventoryItem = workEffortInventoryAssign.getRelatedOne("InventoryItem")/>
- <#assign product = inventoryItem.getRelatedOne("Product")/>
+ <#assign inventoryItem = workEffortInventoryAssign.getRelatedOne("InventoryItem", false)/>
+ <#assign product = inventoryItem.getRelatedOne("Product", false)/>
<fo:table-row background-color="${rowColor}">
<#-- bin location -->
<fo:table-cell ><fo:block font-size="10pt"><#if inventoryItem?exists>${inventoryItem.locationSeqId?default("_NA_")}</#if></fo:block></fo:table-cell>
@@ -266,7 +266,7 @@ under the License.
<fo:table-column column-width="100pt"/>
<fo:table-body>
<#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/branches/20120329_portletWidget/applications/product/webapp/facility/facility/ViewContactMechs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/ViewContactMechs.ftl Tue Jun 19 21:36:11 2012
@@ -30,7 +30,7 @@ under the License.
</td>
<td valign="top">
<#list contactMechMap.facilityContactMechPurposes as facilityContactMechPurpose>
- <#assign contactMechPurposeType = facilityContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
+ <#assign contactMechPurposeType = facilityContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
<#if contactMechPurposeType?has_content>
<b>${contactMechPurposeType.get("description",locale)}</b>
<#else>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl Tue Jun 19 21:36:11 2012
@@ -23,7 +23,7 @@ under the License.
<#assign index = 0>
<#list labelTypes as labelType>
<#assign index = index + 1>
- <#assign labels = labelType.getRelated("InventoryItemLabel", Static["org.ofbiz.base.util.UtilMisc"].toList("inventoryItemLabelId"))>
+ <#assign labels = labelType.getRelated("InventoryItemLabel", null, Static["org.ofbiz.base.util.UtilMisc"].toList("inventoryItemLabelId"), false)>
<tr>
<td>
<div>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Tue Jun 19 21:36:11 2012
@@ -119,7 +119,7 @@ under the License.
<td width="74%">
<select name="statusId">
<#if (inventoryTransfer.statusId)?exists>
- <#assign curStatusItem = inventoryTransfer.getRelatedOneCache("StatusItem")>
+ <#assign curStatusItem = inventoryTransfer.getRelatedOne("StatusItem", true)>
<option value="${(inventoryTransfer.statusId)?if_exists}">${(curStatusItem.get("description",locale))?if_exists}</option>
</#if>
<#list statusItems as statusItem>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/inventory/receiveInventory.ftl Tue Jun 19 21:36:11 2012
@@ -187,7 +187,7 @@ under the License.
</tr>
<#-- facility location(s) -->
- <#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists/>
+ <#assign facilityLocations = (product.getRelated("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), null, false))?if_exists/>
<tr>
<td width="14%"> </td>
<td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductFacilityLocation}</td>
@@ -196,9 +196,9 @@ under the License.
<#if facilityLocations?has_content>
<select name="locationSeqId">
<#list facilityLocations as productFacilityLocation>
- <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")/>
- <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists/>
- <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists/>
+ <#assign facility = productFacilityLocation.getRelatedOne("Facility", true)/>
+ <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation", false)?if_exists/>
+ <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))?if_exists/>
<option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option>
</#list>
<option value="">${uiLabelMap.ProductNoLocation}</option>
@@ -273,10 +273,10 @@ under the License.
<input type="hidden" name="partialReceive" value="${partialReceive?if_exists}"/>
<table class="basic-table" cellspacing="0">
<#list shipments?if_exists as shipment>
- <#assign originFacility = shipment.getRelatedOneCache("OriginFacility")?if_exists/>
- <#assign destinationFacility = shipment.getRelatedOneCache("DestinationFacility")?if_exists/>
- <#assign statusItem = shipment.getRelatedOneCache("StatusItem")/>
- <#assign shipmentType = shipment.getRelatedOneCache("ShipmentType")/>
+ <#assign originFacility = shipment.getRelatedOne("OriginFacility", true)?if_exists/>
+ <#assign destinationFacility = shipment.getRelatedOne("DestinationFacility", true)?if_exists/>
+ <#assign statusItem = shipment.getRelatedOne("StatusItem", true)/>
+ <#assign shipmentType = shipment.getRelatedOne("ShipmentType", true)/>
<#assign shipmentDate = shipment.estimatedArrivalDate?if_exists/>
<tr>
<td><hr /></td>
@@ -363,7 +363,7 @@ under the License.
</#if>
</#if>
<#if 0 < defaultQuantity>
- <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")/>
+ <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)/>
<input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
<input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
<input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}"/>
@@ -384,7 +384,7 @@ under the License.
<table class="basic-table" cellspacing="0">
<tr>
<#if orderItem.productId?exists>
- <#assign product = orderItem.getRelatedOneCache("Product")/>
+ <#assign product = orderItem.getRelatedOne("Product", true)/>
<input type="hidden" name="productId_o_${rowCount}" value="${product.productId}"/>
<td width="45%">
${orderItem.orderItemSeqId}: <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.productId} - ${orderItem.itemDescription?if_exists}</a> : ${product.description?if_exists}
@@ -399,13 +399,13 @@ under the License.
<td align="right">${uiLabelMap.ProductLocation}:</td>
<#-- location(s) -->
<td align="right">
- <#assign facilityLocations = (orderItem.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists/>
+ <#assign facilityLocations = (orderItem.getRelated("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), null, false))?if_exists/>
<#if facilityLocations?has_content>
<select name="locationSeqId_o_${rowCount}">
<#list facilityLocations as productFacilityLocation>
- <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")/>
- <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists/>
- <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists/>
+ <#assign facility = productFacilityLocation.getRelatedOne("Facility", true)/>
+ <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation", false)?if_exists/>
+ <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))?if_exists/>
<option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option>
</#list>
<option value="">${uiLabelMap.ProductNoLocation}</option>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/returns/receiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/returns/receiveReturn.ftl Tue Jun 19 21:36:11 2012
@@ -84,9 +84,9 @@ under the License.
<#list returnItems as returnItem>
<#assign defaultQuantity = returnItem.returnQuantity - receivedQuantities[returnItem.returnItemSeqId]?double>
- <#assign orderItem = returnItem.getRelatedOne("OrderItem")?if_exists>
+ <#assign orderItem = returnItem.getRelatedOne("OrderItem", false)?if_exists>
<#if (orderItem?has_content && 0 < defaultQuantity)>
- <#assign orderItemType = (orderItem.getRelatedOne("OrderItemType"))?if_exists>
+ <#assign orderItemType = (orderItem.getRelatedOne("OrderItemType", false))?if_exists>
<input type="hidden" name="returnId_o_${rowCount}" value="${returnItem.returnId}" />
<input type="hidden" name="returnItemSeqId_o_${rowCount}" value="${returnItem.returnItemSeqId}" />
<input type="hidden" name="shipmentId_o_${rowCount}" value="${parameters.shipmentId?if_exists}" />
@@ -105,9 +105,9 @@ under the License.
<tr>
<#assign productId = "">
<#if orderItem.productId?exists>
- <#assign product = orderItem.getRelatedOne("Product")>
+ <#assign product = orderItem.getRelatedOne("Product", false)>
<#assign productId = product.productId>
- <#assign serializedInv = product.getRelatedByAnd("InventoryItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("inventoryItemTypeId", "SERIALIZED_INV_ITEM"))>
+ <#assign serializedInv = product.getRelated("InventoryItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("inventoryItemTypeId", "SERIALIZED_INV_ITEM"), null, false)>
<input type="hidden" name="productId_o_${rowCount}" value="${product.productId}" />
<td width="45%">
<div>
@@ -137,13 +137,13 @@ under the License.
<div class="label">${uiLabelMap.ProductLocation}</div>
</td>
<td align="right">
- <#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists>
+ <#assign facilityLocations = (product.getRelated("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), null, false))?if_exists>
<#if facilityLocations?has_content>
<select name="locationSeqId_o_${rowCount}">
<#list facilityLocations as productFacilityLocation>
- <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")>
- <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists>
- <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists>
+ <#assign facility = productFacilityLocation.getRelatedOne("Facility", true)>
+ <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation", false)?if_exists>
+ <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))?if_exists>
<option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option>
</#list>
<option value="">${uiLabelMap.ProductNoLocation}</option>
@@ -275,4 +275,4 @@ under the License.
success: function(data){jObjectStatusId.html(data);}
});
}
-</script>
\ No newline at end of file
+</script>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/PackOrder.ftl Tue Jun 19 21:36:11 2012
@@ -150,7 +150,7 @@ under the License.
</div>
<div class="screenlet-body">
<#if orderItemShipGroup?has_content>
- <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress")>
+ <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress", false)>
<#assign carrier = orderItemShipGroup.carrierPartyId?default("N/A")>
<table cellpadding="4" cellspacing="4" class="basic-table">
<tr>
@@ -275,7 +275,7 @@ under the License.
<#assign orderItem = itemInfo.orderItem/>
<#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)?if_exists>
<#assign orderItemQuantity = itemInfo.quantity/>
- <#assign orderProduct = orderItem.getRelatedOne("Product")?if_exists/>
+ <#assign orderProduct = orderItem.getRelatedOne("Product", false)?if_exists/>
<#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, itemInfo.productId)?if_exists/>
<#--
<#if orderItem.cancelQuantity?exists>
@@ -315,7 +315,7 @@ under the License.
<select name="boxType_${rowKey}">
<option value=""></option>
<#list carrierShipmentBoxTypes as carrierShipmentBoxType>
- <#assign shipmentBoxType = carrierShipmentBoxType.getRelatedOne("ShipmentBoxType") />
+ <#assign shipmentBoxType = carrierShipmentBoxType.getRelatedOne("ShipmentBoxType", false) />
<option value="${shipmentBoxType.shipmentBoxTypeId}">${shipmentBoxType.description?default(shipmentBoxType.shipmentBoxTypeId)}</option>
</#list>
</select>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl Tue Jun 19 21:36:11 2012
@@ -20,7 +20,7 @@ under the License.
<#escape x as x?xml>
<#if hasPermission>
- <#assign shipGroup = shipment.getRelatedOne("PrimaryOrderItemShipGroup")?if_exists>
+ <#assign shipGroup = shipment.getRelatedOne("PrimaryOrderItemShipGroup", false)?if_exists>
<#assign carrier = (shipGroup.carrierPartyId)?default("N/A")>
<#if packages?has_content>
<#list packages as package>
@@ -73,7 +73,7 @@ under the License.
${carrier}
</#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>
</fo:block>
</fo:table-cell>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/QuickShipOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/QuickShipOrder.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/QuickShipOrder.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/QuickShipOrder.ftl Tue Jun 19 21:36:11 2012
@@ -48,9 +48,9 @@ function setWeight(weight) {
<#elseif !requestParameters.shipmentRouteSegmentId?exists || requestAttributes._ERROR_MESSAGE_?exists>
<form name="routeForm" method="post" action="<@o...@ofbizUrl>">
<#assign shipmentRoute = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRoutes))?if_exists>
- <#assign carrierPerson = (shipmentRoute.getRelatedOne("CarrierPerson"))?if_exists>
- <#assign carrierPartyGroup = (shipmentRoute.getRelatedOne("CarrierPartyGroup"))?if_exists>
- <#assign shipmentMethodType = (shipmentRoute.getRelatedOne("ShipmentMethodType"))?if_exists>
+ <#assign carrierPerson = (shipmentRoute.getRelatedOne("CarrierPerson", false))?if_exists>
+ <#assign carrierPartyGroup = (shipmentRoute.getRelatedOne("CarrierPartyGroup", false))?if_exists>
+ <#assign shipmentMethodType = (shipmentRoute.getRelatedOne("ShipmentMethodType", false))?if_exists>
<input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
<input type="hidden" name="shipmentId" value="${shipmentRoute.shipmentId}"/>
<input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRoute.shipmentRouteSegmentId}"/>
@@ -123,7 +123,7 @@ function setWeight(weight) {
</#if>
<#else>
<form name="weightForm" method="post" action="<@o...@ofbizUrl>">
- <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom")?if_exists>
+ <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom", false)?if_exists>
<input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
<input type="hidden" name="shipmentId" value="${shipmentPackage.shipmentId}"/>
<input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Tue Jun 19 21:36:11 2012
@@ -24,7 +24,7 @@ under the License.
for (var x = 0; x <= rowCount; x++) {
var quantityAcceptedInput = document.getElementById('quantityAccepted_o_' + x);
var quantityInput = document.getElementById('quantity_o_' + x);
- if (quantityAcceptedInput != null && quantityInput != null) {
+ if (quantityAcceptedInput?? && quantityInput??) {
quantityInput.value = quantityAcceptedInput.value;
}
}
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl Tue Jun 19 21:36:11 2012
@@ -36,11 +36,11 @@ under the License.
<fo:block>${uiLabelMap.ProductRouteSegment}: ${shipmentRouteSegment.shipmentRouteSegmentId}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="#D4D0C8">
- <#assign carrierParty = shipmentRouteSegment.getRelatedOne("CarrierParty")?if_exists>
+ <#assign carrierParty = shipmentRouteSegment.getRelatedOne("CarrierParty", false)?if_exists>
<fo:block text-align="center">${uiLabelMap.ProductCarrier}: <#if carrierParty.description?has_content>${carrierParty.description}<#else>${carrierParty.partyId}</#if></fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="#D4D0C8">
- <#assign shipmentMethodType = shipmentRouteSegment.getRelatedOne("ShipmentMethodType")?if_exists>
+ <#assign shipmentMethodType = shipmentRouteSegment.getRelatedOne("ShipmentMethodType", false)?if_exists>
<fo:block text-align="right">${uiLabelMap.ProductShipmentMethod}: <#if shipmentMethodType?has_content>${shipmentMethodType.description}<#else>${uiLabelMap.CommonNA}</#if></fo:block>
</fo:table-cell>
</fo:table-row>
@@ -95,7 +95,7 @@ under the License.
<fo:table-cell padding="2pt" background-color="#D4D0C8">
<fo:block text-align="center">
<#if shipmentPackage.weight?has_content && shipmentPackage.weightUomId?has_content>
- <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom")>
+ <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom", false)>
${uiLabelMap.ProductWeight}: ${shipmentPackage.weight} ${weightUom.get("description",locale)}
</#if>
</fo:block>
@@ -134,8 +134,8 @@ under the License.
<#assign shipmentItem = shipmentItemsData.get("shipmentItem")>
<#assign shippedQuantity = shipmentItemsData.get("shippedQuantity")>
<#assign packageQuantity = shipmentItemsData.get("packageQuantity")>
- <#assign product = shipmentItem.getRelatedOne("Product")>
- <#assign itemIssuances = shipmentItem.getRelated("ItemIssuance")>
+ <#assign product = shipmentItem.getRelatedOne("Product", false)>
+ <#assign itemIssuances = shipmentItem.getRelated("ItemIssuance", null, null, false)>
<fo:table-row>
<fo:table-cell padding="2pt">
<fo:block>${product.internalName} [${shipmentItem.productId}]</fo:block>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/VerifyPick.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/VerifyPick.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/VerifyPick.ftl Tue Jun 19 21:36:11 2012
@@ -112,7 +112,7 @@ under the License.
</div>
<div class="screenlet-body">
<#if orderItemShipGroup?has_content>
- <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress")>
+ <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress", false)>
<#assign carrier = orderItemShipGroup.carrierPartyId?default("N/A")>
<table cellpadding="4" cellspacing="4" class="basic-table">
<tr>
@@ -223,7 +223,7 @@ under the License.
<#assign counter = counter +1>
</#if>
<#assign orderItemQuantity = orderItemQuantity.subtract(verifiedQuantity)>
- <#assign product = orderItem.getRelatedOne("Product")?if_exists/>
+ <#assign product = orderItem.getRelatedOne("Product", false)?if_exists/>
<tr>
<#if (orderItemQuantity.compareTo(readyToVerify) > 0) >
<td><input type="checkbox" name="sel_${rowKey}" value="Y" checked=""/></td>
@@ -261,15 +261,15 @@ under the License.
<input type="hidden" name="prd_${rowKey}" value="${(orderItem.productId)?if_exists}"/>
<input type="hidden" name="ite_${rowKey}" value="${(orderItem.orderItemSeqId)?if_exists}"/>
</tr>
- <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")/>
+ <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)/>
<#if workOrderItemFulfillments?has_content>
<#assign workOrderItemFulfillment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(workOrderItemFulfillments)/>
<#if workOrderItemFulfillment?has_content>
- <#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort")/>
+ <#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort", false)/>
<#if workEffort?has_content>
<#assign workEffortTask = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortParentId", workEffort.workEffortId), null, false))/>
<#if workEffortTask?has_content>
- <#assign workEffortInventoryAssigns = workEffortTask.getRelated("WorkEffortInventoryAssign")/>
+ <#assign workEffortInventoryAssigns = workEffortTask.getRelated("WorkEffortInventoryAssign", null, null, false)/>
<#if workEffortInventoryAssigns?has_content>
<tr>
<th colspan="8">
@@ -278,8 +278,8 @@ under the License.
</tr>
<tr><td colspan="8"><hr /></td></tr>
<#list workEffortInventoryAssigns as workEffortInventoryAssign>
- <#assign inventoryItem = workEffortInventoryAssign.getRelatedOne("InventoryItem")/>
- <#assign product = inventoryItem.getRelatedOne("Product")/>
+ <#assign inventoryItem = workEffortInventoryAssign.getRelatedOne("InventoryItem", false)/>
+ <#assign product = inventoryItem.getRelatedOne("Product", false)/>
<tr>
<td colspan="2"></td>
<td>${product.productId?default("N/A")}</td>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CategoryForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CategoryForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CategoryForms.xml Tue Jun 19 21:36:11 2012
@@ -205,7 +205,7 @@ under the License.
<field name="detailSubScreen" tooltip="${uiLabelMap.ProductDetailSubScreenTooltip}"><text size="60" maxlength="255"/></field>
<field name="submitButton" use-when="productCategoryLink==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
<field name="submitButton" use-when="productCategoryLink!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
- <field name="clearFormButton" title="${uiLabelMap.CommonEmptyHeader}" use-when="productCategoryLink!=null">
+ <field name="clearFormButton" title=" " use-when="productCategoryLink!=null">
<hyperlink target="EditProductCategoryLinks" target-type="intra-app" description="${uiLabelMap.CommonClear}">
<parameter param-name="productCategoryId"/>
</hyperlink>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/PriceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/PriceForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/PriceForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/PriceForms.xml Tue Jun 19 21:36:11 2012
@@ -93,7 +93,7 @@
</drop-down>
</field>
<field name="condValueInput" title="${uiLabelMap.ProductValue}" entry-name="condValue"><text size="10"/></field>
- <field name="condValue" title="${uiLabelMap.CommonEmptyHeader}">
+ <field name="condValue" title=" ">
<drop-down allow-empty="false">
<list-options list-name="productPriceRulesCondValues" key-name="condValue"/>
</drop-down>
@@ -125,7 +125,7 @@
</drop-down>
</field>
<field name="condValueInput" title="${uiLabelMap.ProductValue}"><text size="10"/></field>
- <field name="condValue" title="${uiLabelMap.CommonEmptyHeader}">
+ <field name="condValue" title=" ">
<drop-down allow-empty="false">
<list-options list-name="productPriceRulesCondValues" key-name="condValue"/>
</drop-down>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProductStoreForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProductStoreForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProductStoreForms.xml Tue Jun 19 21:36:11 2012
@@ -782,7 +782,7 @@
<field name="oversizeUnit" title="${uiLabelMap.ProductOversizeUnit}" tooltip="${uiLabelMap.ProductEach} ((${uiLabelMap.ProductHeight} * 2) + (${uiLabelMap.ProductWidth} * 2) + ${uiLabelMap.ProductDepth}) >= ${uiLabelMap.CommonThis} ${uiLabelMap.ProductNumber}"><text/></field>
<field name="oversizePrice" title="${uiLabelMap.ProductOversizeSurcharge}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + (${uiLabelMap.ProductOversizeNumber} * ${uiLabelMap.ProductSurcharge})"><text/></field>
- <field name="WeightTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="WeightTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="wmin" title="${uiLabelMap.ProductMinWt}"><text/></field>
<field name="wmax" title="${uiLabelMap.ProductMaxWt}"><text/></field>
<field name="weightBreakId">
@@ -804,7 +804,7 @@
</field>
<field name="wprice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><text/></field>
- <field name="QuantityTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="QuantityTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="qmin" title="${uiLabelMap.ProductMinQt}"><text/></field>
<field name="qmax" title="${uiLabelMap.ProductMaxQt}"><text/></field>
<field name="quantityBreakId">
@@ -825,7 +825,7 @@
</field>
<field name="qprice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><text/></field>
- <field name="PriceTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="PriceTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="pmin" title="${uiLabelMap.ProductMinPr}"><text/></field>
<field name="pmax" title="${uiLabelMap.ProductMaxPr}"><text/></field>
<field name="priceBreakId">
@@ -929,7 +929,7 @@
<field name="oversizePrice" title="${uiLabelMap.ProductOversizeSurcharge}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + (${uiLabelMap.ProductNumber} ${uiLabelMap.ProductOversize} ${uiLabelMap.ProductProducts} * ${uiLabelMap.ProductSurcharge})"><display/></field>
<field name="WeightTitle1" title="${uiLabelMap.ProductWeightTitle1}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="WeightTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="WeightTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="weightBreakId">
<display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/>
</field>
@@ -939,7 +939,7 @@
<field name="weightUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field>
<field name="QuantityTitle1" title="${uiLabelMap.ProductQuantityTitle1}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="QuantityTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="QuantityTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="quantityBreakId">
<display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/>
</field>
@@ -949,7 +949,7 @@
<field name="quantityUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field>
<field name="PriceTitle1" title="${uiLabelMap.ProductPriceTitle1}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="PriceTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="PriceTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="priceBreakId">
<display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/>
</field>
@@ -1081,7 +1081,7 @@
<parameter param-name="paymentServiceTypeEnumId"/>
</hyperlink>
</field>
- <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:!security.hasEntityPermission("CATALOG", "_UPDATE", session);}">
+ <field name="editLink" title=" " use-when="${bsh:!security.hasEntityPermission("CATALOG", "_UPDATE", session);}">
<display/>
</field>
<field name="deleteLink" title=" " use-when="${bsh:security.hasEntityPermission("CATALOG", "_DELETE", session);}" widget-style="buttontext">
@@ -1091,7 +1091,7 @@
<parameter param-name="paymentServiceTypeEnumId"/>
</hyperlink>
</field>
- <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:!security.hasEntityPermission("CATALOG", "_DELETE", session);}">
+ <field name="deleteLink" title=" " use-when="${bsh:!security.hasEntityPermission("CATALOG", "_DELETE", session);}">
<display/>
</field>
</form>
Modified: ofbiz/branches/20120329_portletWidget/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java Tue Jun 19 21:36:11 2012
@@ -232,7 +232,7 @@ public class LoginEvents {
GenericValue party = null;
try {
- party = supposedUserLogin.getRelatedOne("Party");
+ party = supposedUserLogin.getRelatedOne("Party", false);
} catch (GenericEntityException e) {
Debug.logWarning(e, "", module);
party = null;
Modified: ofbiz/branches/20120329_portletWidget/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java Tue Jun 19 21:36:11 2012
@@ -170,7 +170,7 @@ public class TruitionCoReg {
GenericValue party = null;
try {
- party = userLogin.getRelatedOne("Party");
+ party = userLogin.getRelatedOne("Party", false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -182,7 +182,7 @@ public class TruitionCoReg {
if ("PERSON".equals(party.getString("partyTypeId"))) {
GenericValue person = null;
try {
- person = party.getRelatedOne("Person");
+ person = party.getRelatedOne("Person", false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}