You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/29 06:14:05 UTC
svn commit: r1343488 [2/3] - in /ofbiz/trunk/applications/product:
src/org/ofbiz/product/category/ src/org/ofbiz/product/config/
src/org/ofbiz/product/imagemanagement/ src/org/ofbiz/product/inventory/
src/org/ofbiz/product/price/ src/org/ofbiz/product/...
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy Tue May 29 04:14:02 2012
@@ -78,9 +78,9 @@ if (contentId) {
if ("FULFILLMENT_EMAIL".equals(productContentTypeId)) {
emailData = [:];
if (contentId && content) {
- subjectDr = content.getRelatedOne("DataResource");
+ subjectDr = content.getRelatedOne("DataResource", false);
if (subjectDr) {
- subject = subjectDr.getRelatedOne("ElectronicText");
+ subject = subjectDr.getRelatedOne("ElectronicText", false);
emailData.subject = subject.textData;
emailData.subjectDataResourceId = subject.dataResourceId;
}
@@ -89,9 +89,9 @@ if ("FULFILLMENT_EMAIL".equals(productCo
contentAssocs = result.get("contentAssocs");
if (contentAssocs) {
contentAssocs.each { contentAssoc ->
- bodyContent = contentAssoc.getRelatedOne("ToContent");
- bodyDr = bodyContent.getRelatedOne("DataResource");
- body = bodyDr.getRelatedOne("ElectronicText");
+ bodyContent = contentAssoc.getRelatedOne("ToContent", false);
+ bodyDr = bodyContent.getRelatedOne("DataResource", false);
+ body = bodyDr.getRelatedOne("ElectronicText", false);
emailData.put(contentAssoc.mapKey, body.textData);
emailData.put(contentAssoc.get("mapKey")+"DataResourceId", body.dataResourceId);
}
@@ -103,9 +103,9 @@ if ("FULFILLMENT_EMAIL".equals(productCo
} else if ("DIGITAL_DOWNLOAD".equals(productContentTypeId)) {
downloadData = [:];
if (contentId && content) {
- downloadDr = content.getRelatedOne("DataResource");
+ downloadDr = content.getRelatedOne("DataResource", false);
if (downloadDr) {
- download = downloadDr.getRelatedOne("OtherDataResource");
+ download = downloadDr.getRelatedOne("OtherDataResource", false);
if (download) {
downloadData.file = download.dataResourceContent;
downloadData.fileDataResourceId = download.dataResourceId;
@@ -122,9 +122,9 @@ if ("FULFILLMENT_EMAIL".equals(productCo
//Assume it is a generic simple text content
textData = [:];
if (contentId && content) {
- textDr = content.getRelatedOne("DataResource");
+ textDr = content.getRelatedOne("DataResource", false);
if (textDr) {
- text = textDr.getRelatedOne("ElectronicText");
+ text = textDr.getRelatedOne("ElectronicText", false);
if (text) {
textData.text = text.textData;
textData.textDataResourceId = text.dataResourceId;
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy Tue May 29 04:14:02 2012
@@ -125,7 +125,7 @@ if (product) {
Iterator standardFeatureApplIter = standardFeatureAppls.iterator();
while (standardFeatureApplIter) {
GenericValue standardFeatureAndAppl = (GenericValue) standardFeatureApplIter.next();
- GenericValue featureType = standardFeatureAndAppl.getRelatedOneCache("ProductFeatureType");
+ GenericValue featureType = standardFeatureAndAppl.getRelatedOne("ProductFeatureType", true);
productFeatureTypeLookup.put(standardFeatureAndAppl.getString("productFeatureId"), featureType);
standardFeatureLookup.put(standardFeatureAndAppl.getString("productFeatureId"), standardFeatureAndAppl);
}
@@ -141,7 +141,7 @@ if (product) {
Iterator selectableFeatureAndApplIter = selectableFeatureAppls.iterator();
while (selectableFeatureAndApplIter) {
GenericValue selectableFeatureAndAppl = (GenericValue) selectableFeatureAndApplIter.next();
- GenericValue featureType = selectableFeatureAndAppl.getRelatedOneCache("ProductFeatureType");
+ GenericValue featureType = selectableFeatureAndAppl.getRelatedOne("ProductFeatureType", true);
productFeatureTypeLookup.put(selectableFeatureAndAppl.productFeatureId, featureType);
selectableFeatureLookup.put(selectableFeatureAndAppl.productFeatureId, selectableFeatureAndAppl);
selectableFeatureTypes.add(featureType);
@@ -156,7 +156,7 @@ if (product) {
Iterator distinguishingFeatureIter = distinguishingFeatures.iterator();
while (distinguishingFeatureIter) {
distFeature = (GenericValue) distinguishingFeatureIter.next();
- featureType = distFeature.getRelatedOneCache("ProductFeatureType");
+ featureType = distFeature.getRelatedOne("ProductFeatureType", true);
if (!productFeatureTypeLookup.containsKey(distFeature.productFeatureId)) {
productFeatureTypeLookup.put(distFeature.productFeatureId, featureType);
}
@@ -233,7 +233,7 @@ if (product) {
while (productAssocIter) {
// now get the variant product
productAssoc = (GenericValue)productAssocIter.next();
- assocProduct = productAssoc.getRelatedOne("AssocProduct");
+ assocProduct = productAssoc.getRelatedOne("AssocProduct", false);
if (assocProduct) {
assocProducts.add(assocProduct);
assocProductFeatureAndAppls = assocProduct.getRelated("ProductFeatureAndAppl");
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Tue May 29 04:14:02 2012
@@ -39,7 +39,7 @@ under the License.
<#assign rowClass = "2">
<#list productFeatureCatGrpAppls as productFeatureCatGrpAppl>
<#assign line = line + 1>
- <#assign productFeatureGroup = (productFeatureCatGrpAppl.getRelatedOne("ProductFeatureGroup"))?default(null)>
+ <#assign productFeatureGroup = (productFeatureCatGrpAppl.getRelatedOne("ProductFeatureGroup", false))?default(null)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productFeatureGroup?exists>${(productFeatureGroup.description)?if_exists}</#if> [${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}]</a></td>
<#assign hasntStarted = false>
@@ -118,7 +118,7 @@ under the License.
<#assign rowClass = "2">
<#list productFeatureCategoryAppls as productFeatureCategoryAppl>
<#assign line = line + 1>
- <#assign productFeatureCategory = (productFeatureCategoryAppl.getRelatedOne("ProductFeatureCategory"))?default(null)>
+ <#assign productFeatureCategory = (productFeatureCategoryAppl.getRelatedOne("ProductFeatureCategory", false))?default(null)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productFeatureCategory?exists>${(productFeatureCategory.description)?if_exists}</#if> [${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}]</a></td>
<#assign hasntStarted = false>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl Tue May 29 04:14:02 2012
@@ -35,7 +35,7 @@ under the License.
<#assign rowClass = "2">
<#list productCategoryRoles as productCategoryRole>
<#assign line = line + 1>
- <#assign curRoleType = productCategoryRole.getRelatedOneCache("RoleType")>
+ <#assign curRoleType = productCategoryRole.getRelatedOne("RoleType", true)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><a href="/partymgr/control/viewprofile?party_id=${(productCategoryRole.partyId)?if_exists}" target="_blank" class="buttontext">${(productCategoryRole.partyId)?if_exists}</a></td>
<td>${(curRoleType.get("description",locale))?if_exists}</td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl Tue May 29 04:14:02 2012
@@ -35,8 +35,8 @@ under the License.
<#assign rowClass = "2">
<#list prodCatalogCategories as prodCatalogCategory>
<#assign line = line + 1>
- <#assign prodCatalog = prodCatalogCategory.getRelatedOne("ProdCatalog")>
- <#assign curProdCatalogCategoryType = prodCatalogCategory.getRelatedOneCache("ProdCatalogCategoryType")>
+ <#assign prodCatalog = prodCatalogCategory.getRelatedOne("ProdCatalog", false)>
+ <#assign curProdCatalogCategoryType = prodCatalogCategory.getRelatedOne("ProdCatalogCategoryType", true)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext"><#if prodCatalog?exists>${(prodCatalog.catalogName)?if_exists}</#if> [${(prodCatalogCategory.prodCatalogId)?if_exists}]</a></td>
<td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Tue May 29 04:14:02 2012
@@ -67,7 +67,7 @@ under the License.
<#assign rowCount = 0>
<#list productCategoryMembers as productCategoryMember>
<#assign suffix = "_o_" + productCategoryMember_index>
- <#assign product = productCategoryMember.getRelatedOne("Product")>
+ <#assign product = productCategoryMember.getRelatedOne("Product", false)>
<#assign hasntStarted = false>
<#if productCategoryMember.fromDate?exists && nowTimestamp.before(productCategoryMember.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
<#assign hasExpired = false>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl Tue May 29 04:14:02 2012
@@ -48,7 +48,7 @@ under the License.
<#assign rowClass = "2">
<#list currentProductCategoryRollups as productCategoryRollup>
<#assign suffix = "_o_" + productCategoryRollup_index>
- <#assign curCategory = productCategoryRollup.getRelatedOne("ParentProductCategory")>
+ <#assign curCategory = productCategoryRollup.getRelatedOne("ParentProductCategory", false)>
<#assign hasntStarted = false>
<#if productCategoryRollup.fromDate?exists && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
<#assign hasExpired = false>
@@ -156,7 +156,7 @@ under the License.
<#list parentProductCategoryRollups as productCategoryRollup>
<#assign suffix = "_o_" + lineChild>
<#assign lineChild = lineChild + 1>
- <#assign curCategory = productCategoryRollup.getRelatedOne("CurrentProductCategory")>
+ <#assign curCategory = productCategoryRollup.getRelatedOne("CurrentProductCategory", false)>
<#assign hasntStarted = false>
<#if productCategoryRollup.fromDate?exists && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
<#assign hasExpired = false>
Modified: ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl Tue May 29 04:14:02 2012
@@ -53,7 +53,7 @@ function insertImageName(size,nameValue)
<#assign rowClass = "2">
<#list productContentList as entry>
<#assign productContent=entry.productContent/>
- <#assign productContentType=productContent.getRelatedOneCache("ProdConfItemContentType")/>
+ <#assign productContentType=productContent.getRelatedOne("ProdConfItemContentType", true)/>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${entry.content.description?default("[${uiLabelMap.ProductNoDescription}]")} [${entry.content.contentId}]</td>
<td>${productContentType.description?default(productContent.confItemContentTypeId)}</td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Tue May 29 04:14:02 2012
@@ -87,7 +87,7 @@ under the License.
<#assign rowCount = 0>
<#assign rowClass = "2">
<#list productFeatures as productFeature>
- <#assign curProductFeatureType = productFeature.getRelatedOneCache("ProductFeatureType")>
+ <#assign curProductFeatureType = productFeature.getRelatedOne("ProductFeatureType", true)>
<tr id="productFeatureId_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}" />
<a href="<@o...@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td>
@@ -103,7 +103,7 @@ under the License.
</select></td>
<td><select name='productFeatureCategoryId_o_${rowCount}' size="1">
<#if productFeature.productFeatureCategoryId?has_content>
- <#assign curProdFeatCat = productFeature.getRelatedOne("ProductFeatureCategory")>
+ <#assign curProdFeatCat = productFeature.getRelatedOne("ProductFeatureCategory", false)>
<option value='${productFeature.productFeatureCategoryId}'>${(curProdFeatCat.description)?if_exists} [${productFeature.productFeatureCategoryId}]</option>
<option value='${productFeature.productFeatureCategoryId}'>---</option>
</#if>
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl Tue May 29 04:14:02 2012
@@ -53,8 +53,8 @@ under the License.
<#else>
<#assign rowClass = "2">
</#if>
- <#assign product = goodIdentification.getRelatedOneCache("Product")/>
- <#assign goodIdentificationType = goodIdentification.getRelatedOneCache("GoodIdentificationType")/>
+ <#assign product = goodIdentification.getRelatedOne("Product", true)/>
+ <#assign goodIdentificationType = goodIdentification.getRelatedOne("GoodIdentificationType", true)/>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td>
${product.productId}
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl Tue May 29 04:14:02 2012
@@ -20,7 +20,7 @@ under the License.
<#if productCategory?exists>
<#if productCategoryMembers?has_content>
<#list productCategoryMembers as productCategoryMember>
- <#assign product = productCategoryMember.getRelatedOneCache("Product")>
+ <#assign product = productCategoryMember.getRelatedOne("Product", true)>
<div>
<a href='<@o...@ofbizUrl>' class='buttontext'>
<#if product.internalName?has_content>
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl Tue May 29 04:14:02 2012
@@ -25,7 +25,7 @@ under the License.
<div class='browsecategorytext'><a href="<@o...@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName?if_exists}</a></div>
<div class="browsecategorylist">
<#list prodCatalogCategories as prodCatalogCategory>
- <#assign productCategory = prodCatalogCategory.getRelatedOneCache("ProductCategory")>
+ <#assign productCategory = prodCatalogCategory.getRelatedOne("ProductCategory", true)>
<div class='browsecategorytext'><a href='<@o...@ofbizUrl>' class="browsecategorybutton">${(productCategory.categoryName)?default(productCategory.description)?default(productCategory.productCategoryId)}</a></div>
</#list>
</div>
Modified: ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Tue May 29 04:14:02 2012
@@ -83,7 +83,7 @@ under the License.
<input type="hidden" name="productPriceCondSeqId" value="${productPriceCond.productPriceCondSeqId}"/>
<select name="inputParamEnumId" size="1">
<#if productPriceCond.inputParamEnumId?has_content>
- <#assign inputParamEnum = productPriceCond.getRelatedOneCache("InputParamEnumeration")?if_exists>
+ <#assign inputParamEnum = productPriceCond.getRelatedOne("InputParamEnumeration", true)?if_exists>
<option value="${productPriceCond.inputParamEnumId}"><#if inputParamEnum?exists>${inputParamEnum.get("description",locale)}<#else>[${productPriceCond.inputParamEnumId}]</#if></option>
<option value="${productPriceCond.inputParamEnumId}"> </option>
<#else>
@@ -95,7 +95,7 @@ under the License.
</select>
<select name="operatorEnumId" size="1">
<#if productPriceCond.operatorEnumId?has_content>
- <#assign operatorEnum = productPriceCond.getRelatedOneCache("OperatorEnumeration")?if_exists>
+ <#assign operatorEnum = productPriceCond.getRelatedOne("OperatorEnumeration", true)?if_exists>
<option value="${productPriceCond.operatorEnumId}"><#if operatorEnum?exists>${operatorEnum.get("description",locale)}<#else>[${productPriceCond.operatorEnumId}]</#if></option>
<option value="${productPriceCond.operatorEnumId}"> </option>
<#else>
@@ -166,7 +166,7 @@ under the License.
<input type="hidden" name="productPriceActionSeqId" value="${productPriceAction.productPriceActionSeqId}" />
<select name="productPriceActionTypeId" size="1">
<#if productPriceAction.productPriceActionTypeId?has_content>
- <#assign productPriceActionType = productPriceAction.getRelatedOneCache("ProductPriceActionType")>
+ <#assign productPriceActionType = productPriceAction.getRelatedOne("ProductPriceActionType", true)>
<option value="${productPriceAction.productPriceActionTypeId}"><#if productPriceActionType?exists>${productPriceActionType.get("description",locale)}<#else>[${productPriceAction.productPriceActionTypeId}]</#if></option>
<option value="${productPriceAction.productPriceActionTypeId}"> </option>
<#else>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl Tue May 29 04:14:02 2012
@@ -71,7 +71,7 @@ under the License.
<#assign rowClass = "2">
<#if (listSize > 0)>
<#list productFeatures as productFeature>
- <#assign curProductFeatureType = productFeature.getRelatedOneCache("ProductFeatureType")>
+ <#assign curProductFeatureType = productFeature.getRelatedOne("ProductFeatureType", true)>
<tr id="productFeatureId_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}" />
<td><a href="<@o...@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Tue May 29 04:14:02 2012
@@ -108,7 +108,7 @@ under the License.
</#if>
<#else>
<#assign isCreate = false>
- <#assign curProductAssocType = productAssoc.getRelatedOneCache("ProductAssocType")>
+ <#assign curProductAssocType = productAssoc.getRelatedOne("ProductAssocType", true)>
<input type="hidden" name="UPDATE_MODE" value="UPDATE" />
<input type="hidden" name="PRODUCT_ID" value="${productId?if_exists}" />
<input type="hidden" name="PRODUCT_ID_TO" value="${productIdTo?if_exists}" />
@@ -201,8 +201,8 @@ under the License.
</tr>
<#assign rowClass = "2">
<#list assocFromProducts as assocFromProduct>
- <#assign listToProduct = assocFromProduct.getRelatedOneCache("AssocProduct")>
- <#assign curProductAssocType = assocFromProduct.getRelatedOneCache("ProductAssocType")>
+ <#assign listToProduct = assocFromProduct.getRelatedOne("AssocProduct", true)>
+ <#assign curProductAssocType = assocFromProduct.getRelatedOne("ProductAssocType", true)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)?if_exists}</a></td>
<td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if> </td>
@@ -248,8 +248,8 @@ under the License.
</tr>
<#assign rowClass = "2">
<#list assocToProducts as assocToProduct>
- <#assign listToProduct = assocToProduct.getRelatedOneCache("MainProduct")>
- <#assign curProductAssocType = assocToProduct.getRelatedOneCache("ProductAssocType")>
+ <#assign listToProduct = assocToProduct.getRelatedOne("MainProduct", true)>
+ <#assign curProductAssocType = assocToProduct.getRelatedOne("ProductAssocType", true)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocToProduct.productId)?if_exists}</a></td>
<td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl Tue May 29 04:14:02 2012
@@ -42,9 +42,9 @@ under the License.
<#if productFeatureAndAppl.uomId?exists>
<#assign curProductFeatureUom = delegator.findOne("Uom",{"uomId",productFeatureAndAppl.uomId}, true)>
</#if>
- <#assign curProductFeatureType = productFeatureAndAppl.getRelatedOneCache("ProductFeatureType")>
- <#assign curProductFeatureApplType = productFeatureAndAppl.getRelatedOneCache("ProductFeatureApplType")>
- <#assign curProductFeatureCategory = (productFeatureAndAppl.getRelatedOneCache("ProductFeatureCategory")?if_exists)>
+ <#assign curProductFeatureType = productFeatureAndAppl.getRelatedOne("ProductFeatureType", true)>
+ <#assign curProductFeatureApplType = productFeatureAndAppl.getRelatedOne("ProductFeatureApplType", true)>
+ <#assign curProductFeatureCategory = (productFeatureAndAppl.getRelatedOne("ProductFeatureCategory", true)?if_exists)>
<tr id="productFeatureId_tableRow_${productFeatureAndAppl_index}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td>
<input type="hidden" name="productId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productId)?if_exists}" />
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Tue May 29 04:14:02 2012
@@ -54,10 +54,10 @@ under the License.
<#-- NOTE: Delivered for serialized inventory means shipped to customer so they should not be displayed here any more -->
<#if showEmpty || (inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM" && inventoryItem.statusId?if_exists != "INV_DELIVERED")
|| (inventoryItem.inventoryItemTypeId?if_exists == "NON_SERIAL_INV_ITEM" && ((inventoryItem.availableToPromiseTotal?exists && inventoryItem.availableToPromiseTotal != 0) || (inventoryItem.quantityOnHandTotal?exists && inventoryItem.quantityOnHandTotal != 0)))>
- <#assign curInventoryItemType = inventoryItem.getRelatedOne("InventoryItemType")>
- <#assign curStatusItem = inventoryItem.getRelatedOneCache("StatusItem")?if_exists>
- <#assign facilityLocation = inventoryItem.getRelatedOne("FacilityLocation")?if_exists>
- <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists>
+ <#assign curInventoryItemType = inventoryItem.getRelatedOne("InventoryItemType", false)>
+ <#assign curStatusItem = inventoryItem.getRelatedOne("StatusItem", true)?if_exists>
+ <#assign facilityLocation = inventoryItem.getRelatedOne("FacilityLocation", false)?if_exists>
+ <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))?if_exists>
<#assign inventoryItemDetailFirst = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(inventoryItem.getRelated("InventoryItemDetail", Static["org.ofbiz.base.util.UtilMisc"].toList("effectiveDate")))?if_exists>
<#if curInventoryItemType?exists>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl Tue May 29 04:14:02 2012
@@ -33,7 +33,7 @@ under the License.
<#assign rowClass = "2">
<#list productRoles as productRole>
<#assign line = line + 1>
- <#assign curRoleType = productRole.getRelatedOneCache("RoleType")>
+ <#assign curRoleType = productRole.getRelatedOne("RoleType", true)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><a href="/partymgr/control/viewprofile?partyId=${(productRole.partyId)?if_exists}" target="_blank" class="buttontext">${(productRole.partyId)?if_exists}</a></td>
<td>${(curRoleType.get("description",locale))?if_exists}</td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Tue May 29 04:14:02 2012
@@ -120,7 +120,7 @@ function doPublish() {
<#assign idx=0/>
<#assign rowClass = "2">
<#list productAssocs as productAssoc>
- <#assign assocProduct = productAssoc.getRelatedOne("AssocProduct")/>
+ <#assign assocProduct = productAssoc.getRelatedOne("AssocProduct", false)/>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td nowrap="nowrap">
<input type="hidden" name="productId${idx}" value="${assocProduct.productId?if_exists}"/>
@@ -403,7 +403,7 @@ function doPublish() {
<table cellspacing="0" class="basic-table">
<#assign rowClass = "2">
<#list productCategoryMembers as prodCatMemb>
- <#assign prodCat = prodCatMemb.getRelatedOne("ProductCategory")/>
+ <#assign prodCat = prodCatMemb.getRelatedOne("ProductCategory", false)/>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td colspan="2">
<form name="quickAdminRemoveProductFromCategory_${prodCatMemb_index}" action="<@o...@ofbizUrl>" method="post">
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ViewProductOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ViewProductOrders.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ViewProductOrders.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ViewProductOrders.ftl Tue May 29 04:14:02 2012
@@ -76,13 +76,13 @@ under the License.
<#list orderItems as orderItem>
<tr>
<td><a href="/ordermgr/control/orderview?orderId=${orderItem.orderId}" class='buttontext'>${orderItem.orderId}</a></td>
- <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")/>
+ <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem", false)/>
<td>${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}</td>
<td>${orderItem.orderItemSeqId}</td>
<td>${order.orderDate}</td>
<td>${orderItem.unitPrice}</td>
<td>${orderItem.quantity}</td>
- <#assign currentOrderType = order.getRelatedOne("OrderType")/>
+ <#assign currentOrderType = order.getRelatedOne("OrderType", false)/>
<td>${currentOrderType.get("description",locale)?default(currentOrderType.orderTypeId)}</td>
</tr>
</#list>
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Tue May 29 04:14:02 2012
@@ -81,7 +81,7 @@ under the License.
<input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}"/>
<select name="inputParamEnumId" size="1">
<#if (productPromoCond.inputParamEnumId)?exists>
- <#assign inputParamEnum = productPromoCond.getRelatedOneCache("InputParamEnumeration")>
+ <#assign inputParamEnum = productPromoCond.getRelatedOne("InputParamEnumeration", true)>
<option value="${productPromoCond.inputParamEnumId}"><#if inputParamEnum?exists>${(inputParamEnum.get("description",locale))?if_exists}<#else>[${(productPromoCond.inputParamEnumId)?if_exists}]</#if></option>
<option value="${(productPromoCond.inputParamEnumId)?if_exists}"> </option>
<#else>
@@ -93,7 +93,7 @@ under the License.
</select>
<select name="operatorEnumId" size="1">
<#if (productPromoCond.operatorEnumId)?exists>
- <#assign operatorEnum = productPromoCond.getRelatedOneCache("OperatorEnumeration")>
+ <#assign operatorEnum = productPromoCond.getRelatedOne("OperatorEnumeration", true)>
<option value="${(productPromoCond.operatorEnumId)?if_exists}"><#if operatorEnum?exists>${(operatorEnum.get("description",locale))?if_exists}<#else>[${(productPromoCond.operatorEnumId)?if_exists}]</#if></option>
<option value="${(productPromoCond.operatorEnumId)?if_exists}"> </option>
<#else>
@@ -122,7 +122,7 @@ under the License.
<option value = "${carrierShippingMethod?if_exists}">${carrierParty?if_exists} ${description}</option>
<option value = ""> </option>
<#list carrierShipmentMethods as carrierShipmentMethod>
- <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOneCache("ShipmentMethodType")>
+ <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType", true)>
<option value = "${carrierShipmentMethod.partyId?if_exists}@${carrierShipmentMethod.shipmentMethodTypeId?if_exists}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.get("description")?if_exists}</option>
</#list>
</select>
@@ -139,8 +139,8 @@ under the License.
<#assign condProductPromoCategories = productPromoCond.getRelated("ProductPromoCategory")>
<#if condProductPromoCategories?has_content>
<#list condProductPromoCategories as condProductPromoCategory>
- <#assign condProductCategory = condProductPromoCategory.getRelatedOneCache("ProductCategory")>
- <#assign condApplEnumeration = condProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
+ <#assign condProductCategory = condProductPromoCategory.getRelatedOne("ProductCategory", true)>
+ <#assign condApplEnumeration = condProductPromoCategory.getRelatedOne("ApplEnumeration", true)>
<div>
${(condProductCategory.get("description",locale))?if_exists} [${condProductPromoCategory.productCategoryId}]
- ${(condApplEnumeration.get("description",locale))?default(condProductPromoCategory.productPromoApplEnumId)}
@@ -185,8 +185,8 @@ under the License.
<#assign condProductPromoProducts = productPromoCond.getRelated("ProductPromoProduct")>
<#if condProductPromoProducts?has_content>
<#list condProductPromoProducts as condProductPromoProduct>
- <#assign condProduct = condProductPromoProduct.getRelatedOneCache("Product")?if_exists>
- <#assign condApplEnumeration = condProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
+ <#assign condProduct = condProductPromoProduct.getRelatedOne("Product", true)?if_exists>
+ <#assign condApplEnumeration = condProductPromoProduct.getRelatedOne("ApplEnumeration", true)>
<div>
${(condProduct.internalName)?if_exists} [${condProductPromoProduct.productId}]
- ${(condApplEnumeration.get("description",locale))?default(condProductPromoProduct.productPromoApplEnumId)}
@@ -251,7 +251,7 @@ under the License.
<select name = "carrierShipmentMethod">
<option value = "">--${uiLabelMap.OrderSelectShippingMethod}--</option>
<#list carrierShipmentMethods as carrierShipmentMethod>
- <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOneCache("ShipmentMethodType")>
+ <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType", true)>
<option value = "${carrierShipmentMethod.partyId?if_exists}@${carrierShipmentMethod.shipmentMethodTypeId?if_exists}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.get("description")?if_exists}</option>
</#list>
</select>
@@ -280,7 +280,7 @@ under the License.
<input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}" />
<select name="productPromoActionEnumId" size="1">
<#if (productPromoAction.productPromoActionEnumId)?exists>
- <#assign productPromoActionCurEnum = productPromoAction.getRelatedOneCache("ActionEnumeration")>
+ <#assign productPromoActionCurEnum = productPromoAction.getRelatedOne("ActionEnumeration", true)>
<option value="${(productPromoAction.productPromoActionEnumId)?if_exists}"><#if productPromoActionCurEnum?exists>${(productPromoActionCurEnum.get("description",locale))?if_exists}<#else>[${(productPromoAction.productPromoActionEnumId)?if_exists}]</#if></option>
<option value="${(productPromoAction.productPromoActionEnumId)?if_exists}"> </option>
<#else>
@@ -299,7 +299,7 @@ under the License.
${uiLabelMap.UseCartQuantity}:
<select name="useCartQuantity">
<#if (productPromoAction.useCartQuantity)?exists>
- <#assign productPromoActionCurEnum = productPromoAction.getRelatedOneCache("ActionEnumeration")>
+ <#assign productPromoActionCurEnum = productPromoAction.getRelatedOne("ActionEnumeration", true)>
<option value="${(productPromoAction.useCartQuantity)?if_exists}"><#if (productPromoAction.useCartQuantity.equals("Y"))>${uiLabelMap.CommonY}<#else>${uiLabelMap.CommonN}</#if></option>
<option value="${(productPromoAction.useCartQuantity)?if_exists}"> </option>
<#else>
@@ -322,8 +322,8 @@ under the License.
<#assign actionProductPromoCategories = productPromoAction.getRelated("ProductPromoCategory")>
<#if actionProductPromoCategories?has_content>
<#list actionProductPromoCategories as actionProductPromoCategory>
- <#assign actionProductCategory = actionProductPromoCategory.getRelatedOneCache("ProductCategory")>
- <#assign actionApplEnumeration = actionProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
+ <#assign actionProductCategory = actionProductPromoCategory.getRelatedOne("ProductCategory", true)>
+ <#assign actionApplEnumeration = actionProductPromoCategory.getRelatedOne("ApplEnumeration", true)>
<div>
${(actionProductCategory.description)?if_exists} [${actionProductPromoCategory.productCategoryId}]
- ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoCategory.productPromoApplEnumId)}
@@ -369,8 +369,8 @@ under the License.
<#assign actionProductPromoProducts = productPromoAction.getRelated("ProductPromoProduct")>
<#if actionProductPromoProducts?has_content>
<#list actionProductPromoProducts as actionProductPromoProduct>
- <#assign actionProduct = actionProductPromoProduct.getRelatedOneCache("Product")?if_exists>
- <#assign actionApplEnumeration = actionProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
+ <#assign actionProduct = actionProductPromoProduct.getRelatedOne("Product", true)?if_exists>
+ <#assign actionApplEnumeration = actionProductPromoProduct.getRelatedOne("ApplEnumeration", true)>
<div>
${(actionProduct.internalName)?if_exists} [${actionProductPromoProduct.productId}]
- ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoProduct.productPromoApplEnumId)}
@@ -476,8 +476,8 @@ under the License.
<#-- ======================= Categories ======================== -->
<div class="screenlet-body">
<#list promoProductPromoCategories as promoProductPromoCategory>
- <#assign promoProductCategory = promoProductPromoCategory.getRelatedOneCache("ProductCategory")>
- <#assign promoApplEnumeration = promoProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
+ <#assign promoProductCategory = promoProductPromoCategory.getRelatedOne("ProductCategory", true)>
+ <#assign promoApplEnumeration = promoProductPromoCategory.getRelatedOne("ApplEnumeration", true)>
<div>
${(promoProductCategory.description)?if_exists} [${promoProductPromoCategory.productCategoryId}]
- ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoCategory.productPromoApplEnumId)}
@@ -523,8 +523,8 @@ under the License.
<#-- ======================= Products ======================== -->
<div class="screenlet-body">
<#list promoProductPromoProducts as promoProductPromoProduct>
- <#assign promoProduct = promoProductPromoProduct.getRelatedOneCache("Product")?if_exists>
- <#assign promoApplEnumeration = promoProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
+ <#assign promoProduct = promoProductPromoProduct.getRelatedOne("Product", true)?if_exists>
+ <#assign promoApplEnumeration = promoProductPromoProduct.getRelatedOne("ApplEnumeration", true)>
<div>
${(promoProduct.internalName)?if_exists} [${promoProductPromoProduct.productId}]
- ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoProduct.productPromoApplEnumId)}
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl Tue May 29 04:14:02 2012
@@ -33,7 +33,7 @@ under the License.
<#assign rowClass = "2">
<#list productStorePromoAppls as productStorePromoAppl>
<#assign line = line + 1>
- <#assign productStore = productStorePromoAppl.getRelatedOne("ProductStore")>
+ <#assign productStore = productStorePromoAppl.getRelatedOne("ProductStore", false)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productStore?exists>${(productStore.storeName)?if_exists}</#if>[${productStorePromoAppl.productStoreId}]</a></td>
<#assign hasntStarted = false>
Modified: ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl Tue May 29 04:14:02 2012
@@ -57,14 +57,14 @@ under the License.
<#assign rowClass = "2">
<#list pendingReviews as review>
<#if review.userLoginId?has_content>
- <#assign postedUserLogin = review.getRelatedOne("UserLogin")>
+ <#assign postedUserLogin = review.getRelatedOne("UserLogin", false)>
<#if postedUserLogin.partyId?has_content>
- <#assign party = postedUserLogin.getRelatedOne("Party")>
+ <#assign party = postedUserLogin.getRelatedOne("Party", false)>
<#assign partyTypeId = party.get("partyTypeId")>
<#if partyTypeId == "PERSON">
- <#assign postedPerson = postedUserLogin.getRelatedOne("Person")>
+ <#assign postedPerson = postedUserLogin.getRelatedOne("Person", false)>
<#else>
- <#assign postedPerson = postedUserLogin.getRelatedOne("PartyGroup")>
+ <#assign postedPerson = postedUserLogin.getRelatedOne("PartyGroup", false)>
</#if>
</#if>
</#if>
@@ -94,11 +94,11 @@ under the License.
<option value="Y">${uiLabelMap.CommonY}</option>
</select>
</td>
- <td>${review.getRelatedOne("Product").internalName?if_exists}<br /><a class="buttontext" href="<@o...@ofbizUrl>">${review.productId}</a></td>
+ <td>${review.getRelatedOne("Product", false).internalName?if_exists}<br /><a class="buttontext" href="<@o...@ofbizUrl>">${review.productId}</a></td>
<td>
<input type="text" size='3' name="productRating_o_${rowCount}" value="${review.productRating?if_exists?string}" />
</td>
- <td>${review.getRelatedOne("StatusItem").get("description", locale)}</td>
+ <td>${review.getRelatedOne("StatusItem", false).get("description", locale)}</td>
<td>
<textarea name="productReview_o_${rowCount}" rows="5" cols="30" wrap="hard">${review.productReview?if_exists}</textarea>
</td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl Tue May 29 04:14:02 2012
@@ -34,8 +34,8 @@ under the License.
</tr>
<#assign alt_row = false>
<#list productStoreSurveys as storeSurvey>
- <#assign surveyType = storeSurvey.getRelatedOne("SurveyApplType")>
- <#assign survey = storeSurvey.getRelatedOne("Survey")>
+ <#assign surveyType = storeSurvey.getRelatedOne("SurveyApplType", false)>
+ <#assign survey = storeSurvey.getRelatedOne("Survey", false)>
<tr valign="middle"<#if alt_row>class="alternate-row"</#if>>
<td>${surveyType.get("description",locale)}</td>
<td>${storeSurvey.groupName?if_exists}</td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl Tue May 29 04:14:02 2012
@@ -45,7 +45,7 @@ under the License.
<table cellspacing="0" class="basic-table">
<#assign rowClass = "2">
<#list keywordThesauruses as keyword>
- <#assign relationship = keyword.getRelatedOneCache("RelationshipEnumeration")>
+ <#assign relationship = keyword.getRelatedOne("RelationshipEnumeration", true)>
<#if keyword.enteredKeyword == lastkeyword><#assign sameRow=true><#else><#assign lastkeyword=keyword.enteredKeyword><#assign sameRow=false></#if>
<#if sameRow == false>
<#if (keyword_index > 0)>
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy Tue May 29 04:14:02 2012
@@ -28,7 +28,7 @@ if (!facility) {
facility = delegator.makeValue("Facility");
facilityType = delegator.makeValue("FacilityType");
} else {
- facilityType = facility.getRelatedOne("FacilityType");
+ facilityType = facility.getRelatedOne("FacilityType", false);
}
context.facility = facility;
context.facilityType = facilityType;
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy Tue May 29 04:14:02 2012
@@ -29,7 +29,7 @@ if (!facility) {
context.facility = delegator.makeValue("Facility", null);
context.facilityType = delegator.makeValue("FacilityType", null);
} else {
- facilityType = facility.getRelatedOne("FacilityType");
+ facilityType = facility.getRelatedOne("FacilityType", false);
}
context.facility = facility;
context.facilityType = facilityType;
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy Tue May 29 04:14:02 2012
@@ -28,9 +28,9 @@ if (inventoryItem && "NON_SERIAL_INV_ITE
physicalInventoryAndVarianceDatas.add(physicalInventoryAndVarianceData);
physicalInventoryAndVarianceData.physicalInventoryAndVariance = physicalInventoryAndVariance;
- physicalInventoryAndVarianceData.varianceReason = physicalInventoryAndVariance.getRelatedOneCache("VarianceReason");
- physicalInventoryAndVarianceData.person = physicalInventoryAndVariance.getRelatedOne("Person");
- physicalInventoryAndVarianceData.partyGroup = physicalInventoryAndVariance.getRelatedOne("PartyGroup");
+ physicalInventoryAndVarianceData.varianceReason = physicalInventoryAndVariance.getRelatedOne("VarianceReason", true);
+ physicalInventoryAndVarianceData.person = physicalInventoryAndVariance.getRelatedOne("Person", false);
+ physicalInventoryAndVarianceData.partyGroup = physicalInventoryAndVariance.getRelatedOne("PartyGroup", false);
}
context.physicalInventoryAndVarianceDatas = physicalInventoryAndVarianceDatas;
}
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy Tue May 29 04:14:02 2012
@@ -39,7 +39,7 @@ if (facilityId) {
ownerAcctgPref = null;
if (facility) {
- owner = facility.getRelatedOne("OwnerParty");
+ owner = facility.getRelatedOne("OwnerParty", false);
if (owner) {
result = dispatcher.runSync("getPartyAccountingPreferences", [organizationPartyId : owner.partyId, userLogin : request.getAttribute("userLogin")]);
if (!ServiceUtil.isError(result) && result.partyAccountingPreference) {
@@ -68,7 +68,7 @@ if (purchaseOrder && !shipmentId) {
if (orderShipments) {
shipments = [] as TreeSet;
orderShipments.each { orderShipment ->
- shipment = orderShipment.getRelatedOne("Shipment");
+ shipment = orderShipment.getRelatedOne("Shipment", false);
if (!"PURCH_SHIP_RECEIVED".equals(shipment.statusId) &&
!"SHIPMENT_CANCELLED".equals(shipment.statusId) &&
(!shipment.destinationFacilityId || facilityId.equals(shipment.destinationFacilityId))) {
@@ -81,7 +81,7 @@ if (purchaseOrder && !shipmentId) {
if (issuances) {
shipments = [] as TreeSet;
issuances.each { issuance ->
- shipment = issuance.getRelatedOne("Shipment");
+ shipment = issuance.getRelatedOne("Shipment", false);
if (!"PURCH_SHIP_RECEIVED".equals(shipment.statusId) &&
!"SHIPMENT_CANCELLED".equals(shipment.statusId) &&
(!shipment.destinationFacilityId || facilityId.equals(shipment.destinationFacilityId))) {
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy Tue May 29 04:14:02 2012
@@ -60,13 +60,13 @@ if (inventoryItemId) {
}
if (inventoryItem) {
context.inventoryItem = inventoryItem;
- inventoryItemType = inventoryItem.getRelatedOne("InventoryItemType");
+ inventoryItemType = inventoryItem.getRelatedOne("InventoryItemType", false);
if (inventoryItemType) {
context.inventoryItemType = inventoryItemType;
}
if (inventoryItem.statusId) {
- inventoryStatus = inventoryItem.getRelatedOne("StatusItem");
+ inventoryStatus = inventoryItem.getRelatedOne("StatusItem", false);
if (inventoryStatus) {
context.inventoryStatus = inventoryStatus;
}
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy Tue May 29 04:14:02 2012
@@ -29,8 +29,8 @@ selectFromShipmentPlan = request.getPara
shipment = delegator.findOne("Shipment", [shipmentId : shipmentId], false);
if (shipment) {
- context.originFacility = shipment.getRelatedOne("OriginFacility");
- context.destinationFacility = shipment.getRelatedOne("DestinationFacility");
+ context.originFacility = shipment.getRelatedOne("OriginFacility", false);
+ context.destinationFacility = shipment.getRelatedOne("DestinationFacility", false);
}
if (!orderId && shipment && !selectFromShipmentPlan) {
@@ -45,8 +45,8 @@ if (orderId && shipment) {
context.orderHeader = orderHeader;
if (orderHeader) {
- context.orderHeaderStatus = orderHeader.getRelatedOne("StatusItem");
- context.orderType = orderHeader.getRelatedOne("OrderType");
+ context.orderHeaderStatus = orderHeader.getRelatedOne("StatusItem", false);
+ context.orderType = orderHeader.getRelatedOne("OrderType", false);
isSalesOrder = "SALES_ORDER".equals(orderHeader.orderTypeId);
context.isSalesOrder = isSalesOrder;
@@ -65,7 +65,7 @@ if (orderId && shipment) {
orderItemDatas = [] as LinkedList;
orderItems.each { orderItemAndShipGroupAssoc ->
orderItemData = [:];
- product = orderItemAndShipGroupAssoc.getRelatedOne("Product");
+ product = orderItemAndShipGroupAssoc.getRelatedOne("Product", false);
itemIssuances = orderItemAndShipGroupAssoc.getRelated("ItemIssuance");
totalQuantityIssued = 0;
@@ -87,11 +87,11 @@ if (orderId && shipment) {
orderItemShipGrpInvResDatas = [] as LinkedList;
totalQuantityReserved = 0;
orderItemShipGrpInvResList.each { orderItemShipGrpInvRes ->
- inventoryItem = orderItemShipGrpInvRes.getRelatedOne("InventoryItem");
+ inventoryItem = orderItemShipGrpInvRes.getRelatedOne("InventoryItem", false);
orderItemShipGrpInvResData = [:];
orderItemShipGrpInvResData.orderItemShipGrpInvRes = orderItemShipGrpInvRes;
orderItemShipGrpInvResData.inventoryItem = inventoryItem;
- orderItemShipGrpInvResData.inventoryItemFacility = inventoryItem.getRelatedOne("Facility");
+ orderItemShipGrpInvResData.inventoryItemFacility = inventoryItem.getRelatedOne("Facility", false);
orderItemShipGrpInvResDatas.add(orderItemShipGrpInvResData);
if (orderItemShipGrpInvRes.quantity) {
@@ -120,7 +120,7 @@ if (shipment && selectFromShipmentPlan)
context.isSalesOrder = true;
shipmentPlans.each { shipmentPlan ->
orderItemData = [:];
- orderItem = shipmentPlan.getRelatedOne("OrderItem");
+ orderItem = shipmentPlan.getRelatedOne("OrderItem", false);
orderItemShipGroup = null;
if (shipGroupSeqId) {
@@ -141,7 +141,7 @@ if (shipment && selectFromShipmentPlan)
plannedQuantity = shipmentPlan.getDouble("quantity");
totalProposedQuantity = 0.0;
- product = orderItem.getRelatedOne("Product");
+ product = orderItem.getRelatedOne("Product", false);
itemIssuances = orderItem.getRelated("ItemIssuance");
totalQuantityIssued = 0;
@@ -165,11 +165,11 @@ if (shipment && selectFromShipmentPlan)
orderItemShipGrpInvResDatas = [] as LinkedList;
totalQuantityReserved = 0;
orderItemShipGrpInvResList.each { orderItemShipGrpInvRes ->
- inventoryItem = orderItemShipGrpInvRes.getRelatedOne("InventoryItem");
+ inventoryItem = orderItemShipGrpInvRes.getRelatedOne("InventoryItem", false);
orderItemShipGrpInvResData = [:];
orderItemShipGrpInvResData.orderItemShipGrpInvRes = orderItemShipGrpInvRes;
orderItemShipGrpInvResData.inventoryItem = inventoryItem;
- orderItemShipGrpInvResData.inventoryItemFacility = inventoryItem.getRelatedOne("Facility");
+ orderItemShipGrpInvResData.inventoryItemFacility = inventoryItem.getRelatedOne("Facility", false);
orderItemShipGrpInvResDatas.add(orderItemShipGrpInvResData);
reservedQuantity = 0.0;
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy Tue May 29 04:14:02 2012
@@ -42,11 +42,11 @@ context.shipmentId = shipmentId;
context.shipment = shipment;
if (shipment) {
- currentStatus = shipment.getRelatedOne("StatusItem");
- originPostalAddress = shipment.getRelatedOne("OriginPostalAddress");
- destinationPostalAddress = shipment.getRelatedOne("DestinationPostalAddress");
- originTelecomNumber = shipment.getRelatedOne("OriginTelecomNumber");
- destinationTelecomNumber = shipment.getRelatedOne("DestinationTelecomNumber");
+ currentStatus = shipment.getRelatedOne("StatusItem", false);
+ originPostalAddress = shipment.getRelatedOne("OriginPostalAddress", false);
+ destinationPostalAddress = shipment.getRelatedOne("DestinationPostalAddress", false);
+ originTelecomNumber = shipment.getRelatedOne("OriginTelecomNumber", false);
+ destinationTelecomNumber = shipment.getRelatedOne("DestinationTelecomNumber", false);
if (orderHeader) {
context.productStoreId = orderHeader.productStoreId;
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy Tue May 29 04:14:02 2012
@@ -53,7 +53,7 @@ if (shipment) {
shipmentItemData.shipmentPackageContents = shipmentPackageContents;
shipmentItemData.itemIssuances = shipmentItem.getRelated("ItemIssuance");
shipmentItemData.orderShipments = shipmentItem.getRelated("OrderShipment");
- shipmentItemData.product = shipmentItem.getRelatedOne("Product");
+ shipmentItemData.product = shipmentItem.getRelatedOne("Product", false);
shipmentItemData.totalQuantityPackaged = totalQuantityPackaged;
shipmentItemData.totalQuantityToPackage = totalQuantityToPackage;
shipmentItemDatas.add(shipmentItemData);
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy Tue May 29 04:14:02 2012
@@ -38,7 +38,7 @@ if (shipment) {
shipmentPackageData.shipmentPackage = shipmentPackage;
shipmentPackageData.shipmentPackageContents = shipmentPackage.getRelated("ShipmentPackageContent");
shipmentPackageData.shipmentPackageRouteSegs = shipmentPackage.getRelated("ShipmentPackageRouteSeg");
- shipmentPackageData.weightUom = shipmentPackage.getRelatedOne("WeightUom");
+ shipmentPackageData.weightUom = shipmentPackage.getRelatedOne("WeightUom", false);
shipmentPackageDatas.add(shipmentPackageData);
}
}
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy Tue May 29 04:14:02 2012
@@ -64,8 +64,8 @@ if (shipment) {
if (shipmentPlans) {
shipmentPlans.each { shipmentPlan ->
oneRow = new HashMap(shipmentPlan);
- // oneRow.putAll(shipmentPlan.getRelatedOne("OrderItemShipGrpInvRes"));
- orderItem = shipmentPlan.getRelatedOne("OrderItem");
+ // oneRow.putAll(shipmentPlan.getRelatedOne("OrderItemShipGrpInvRes", false));
+ orderItem = shipmentPlan.getRelatedOne("OrderItem", false);
oneRow.productId = orderItem.productId;
orderedQuantity = orderItem.getDouble("quantity");
canceledQuantity = orderItem.getDouble("cancelQuantity");
@@ -147,7 +147,7 @@ if (shipmentPlans) {
oneRow.notAvailableQuantity = reservedNotAvailable;
// Planned Weight and Volume
- product = orderItem.getRelatedOne("Product");
+ product = orderItem.getRelatedOne("Product", false);
weight = 0.0;
quantity = 0.0;
if (shipmentPlan.getDouble("quantity")) {
@@ -190,7 +190,7 @@ if (shipmentPlans) {
addRows = [] as ArrayList;
if (orderItemShipGroupAssocs) {
orderItemShipGroupAssocs.each { orderItemShipGroupAssoc ->
- orderItem = orderItemShipGroupAssoc.getRelatedOne("OrderItem");
+ orderItem = orderItemShipGroupAssoc.getRelatedOne("OrderItem", false);
oneRow = [:];
oneRow.shipmentId = shipmentId;
oneRow.orderId = orderItemShipGroupAssoc.orderId;
@@ -250,7 +250,7 @@ if (orderItemShipGroupAssocs) {
// Planned (unitary) Weight and Volume
weight = new Double(0);
- product = orderItem.getRelatedOne("Product");
+ product = orderItem.getRelatedOne("Product", false);
if (product.getDouble("weight")) {
weight = product.getDouble("weight");
}
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy Tue May 29 04:14:02 2012
@@ -37,19 +37,19 @@ if (shipment) {
shipmentRouteSegments.each { shipmentRouteSegment ->
shipmentRouteSegmentData = [:];
shipmentRouteSegmentData.shipmentRouteSegment = shipmentRouteSegment;
- shipmentRouteSegmentData.originFacility = shipmentRouteSegment.getRelatedOne("OriginFacility");
- shipmentRouteSegmentData.destFacility = shipmentRouteSegment.getRelatedOne("DestFacility");
- shipmentRouteSegmentData.originPostalAddress = shipmentRouteSegment.getRelatedOne("OriginPostalAddress");
- shipmentRouteSegmentData.originTelecomNumber = shipmentRouteSegment.getRelatedOne("OriginTelecomNumber");
- shipmentRouteSegmentData.destPostalAddress = shipmentRouteSegment.getRelatedOne("DestPostalAddress");
- shipmentRouteSegmentData.destTelecomNumber = shipmentRouteSegment.getRelatedOne("DestTelecomNumber");
- shipmentRouteSegmentData.shipmentMethodType = shipmentRouteSegment.getRelatedOne("ShipmentMethodType");
- shipmentRouteSegmentData.carrierPerson = shipmentRouteSegment.getRelatedOne("CarrierPerson");
- shipmentRouteSegmentData.carrierPartyGroup = shipmentRouteSegment.getRelatedOne("CarrierPartyGroup");
+ shipmentRouteSegmentData.originFacility = shipmentRouteSegment.getRelatedOne("OriginFacility", false);
+ shipmentRouteSegmentData.destFacility = shipmentRouteSegment.getRelatedOne("DestFacility", false);
+ shipmentRouteSegmentData.originPostalAddress = shipmentRouteSegment.getRelatedOne("OriginPostalAddress", false);
+ shipmentRouteSegmentData.originTelecomNumber = shipmentRouteSegment.getRelatedOne("OriginTelecomNumber", false);
+ shipmentRouteSegmentData.destPostalAddress = shipmentRouteSegment.getRelatedOne("DestPostalAddress", false);
+ shipmentRouteSegmentData.destTelecomNumber = shipmentRouteSegment.getRelatedOne("DestTelecomNumber", false);
+ shipmentRouteSegmentData.shipmentMethodType = shipmentRouteSegment.getRelatedOne("ShipmentMethodType", false);
+ shipmentRouteSegmentData.carrierPerson = shipmentRouteSegment.getRelatedOne("CarrierPerson", false);
+ shipmentRouteSegmentData.carrierPartyGroup = shipmentRouteSegment.getRelatedOne("CarrierPartyGroup", false);
shipmentRouteSegmentData.shipmentPackageRouteSegs = shipmentRouteSegment.getRelated("ShipmentPackageRouteSeg");
- shipmentRouteSegmentData.carrierServiceStatusItem = shipmentRouteSegment.getRelatedOne("CarrierServiceStatusItem");
- shipmentRouteSegmentData.currencyUom = shipmentRouteSegment.getRelatedOne("CurrencyUom");
- shipmentRouteSegmentData.billingWeightUom = shipmentRouteSegment.getRelatedOne("BillingWeightUom");
+ shipmentRouteSegmentData.carrierServiceStatusItem = shipmentRouteSegment.getRelatedOne("CarrierServiceStatusItem", false);
+ shipmentRouteSegmentData.currencyUom = shipmentRouteSegment.getRelatedOne("CurrencyUom", false);
+ shipmentRouteSegmentData.billingWeightUom = shipmentRouteSegment.getRelatedOne("BillingWeightUom", false);
if (shipmentRouteSegment.carrierServiceStatusId) {
shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails = delegator.findList("StatusValidChangeToDetail", EntityCondition.makeCondition([statusId : shipmentRouteSegment.carrierServiceStatusId]), null, ['sequenceId'], null, false);
} else {
@@ -68,11 +68,11 @@ if (shipment) {
carrierPartyRoles = delegator.findList("PartyRole", EntityCondition.makeCondition([roleTypeId : 'CARRIER']), null, null, null, false);
carrierPartyDatas = [] as LinkedList;
carrierPartyRoles.each { carrierPartyRole ->
- party = carrierPartyRole.getRelatedOne("Party");
+ party = carrierPartyRole.getRelatedOne("Party", false);
carrierPartyData = [:];
carrierPartyData.party = party;
- carrierPartyData.person = party.getRelatedOne("Person");
- carrierPartyData.partyGroup = party.getRelatedOne("PartyGroup");
+ carrierPartyData.person = party.getRelatedOne("Person", false);
+ carrierPartyData.partyGroup = party.getRelatedOne("PartyGroup", false);
carrierPartyDatas.add(carrierPartyData);
}
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy Tue May 29 04:14:02 2012
@@ -77,10 +77,10 @@ previousShipmentIter.close();
// next scan the order items (via issuances) to count the quantity of each product requested
quantityRequestedByProduct = [:];
countedOrderItems = [:]; // this map is only used to keep track of the order items already counted
-order = shipment.getRelatedOne("PrimaryOrderHeader");
+order = shipment.getRelatedOne("PrimaryOrderHeader", false);
issuances = order.getRelated("ItemIssuance");
issuances.each { issuance ->
- orderItem = issuance.getRelatedOne("OrderItem");
+ orderItem = issuance.getRelatedOne("OrderItem", false);
productId = orderItem.productId;
if (!countedOrderItems.containsKey(orderItem.orderId + orderItem.orderItemSeqId)) {
countedOrderItems.put(orderItem.orderId + orderItem.orderItemSeqId, null);
@@ -103,8 +103,8 @@ shipmentPackages.each { shipmentPackage
// each line is one logical Product and the quantities associated with it
lines = [];
contents.each { content ->
- shipmentItem = content.getRelatedOne("ShipmentItem");
- product = shipmentItem.getRelatedOne("Product");
+ shipmentItem = content.getRelatedOne("ShipmentItem", false);
+ product = shipmentItem.getRelatedOne("Product", false);
productTypeId = product.get("productTypeId");
line = [:];
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy Tue May 29 04:14:02 2012
@@ -48,17 +48,17 @@ if (shipmentId) {
request.setAttribute("_EVENT_MESSAGE_", null);
// set the shipment context info
- context.shipmentType = shipment.getRelatedOneCache("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", true);
+ 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);
context.shipmentPackages = shipment.getRelated("ShipmentPackage", null, ['shipmentPackageSeqId']);
context.shipmentRoutes = shipment.getRelated("ShipmentRouteSegment", null, ['shipmentRouteSegmentId']);
context.shipment = shipment;
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy Tue May 29 04:14:02 2012
@@ -55,7 +55,7 @@ if (!isPurchaseShipment) {
return;
}
-facility = shipment.getRelatedOne("DestinationFacility");
+facility = shipment.getRelatedOne("DestinationFacility", false);
context.facility = facility;
context.facilityId = shipment.destinationFacilityId;
context.now = UtilDateTime.nowTimestamp();
@@ -87,7 +87,7 @@ if (!isPurchaseOrder) {
// Get the base currency from the facility owner, for currency conversions
baseCurrencyUomId = null;
if (facility) {
- owner = facility.getRelatedOne("OwnerParty");
+ owner = facility.getRelatedOne("OwnerParty", false);
if (owner) {
result = dispatcher.runSync("getPartyAccountingPreferences", [organizationPartyId : owner.partyId, userLogin : request.getAttribute("userLogin")]);
if (!ServiceUtil.isError(result) && result.partyAccountingPreference) {
@@ -118,7 +118,7 @@ totalAvailableToReceive = 0;
// Populate the order item data for the FTL
orderItems = orderHeader.getRelated("OrderItemAndShipGroupAssoc", oiasgaLimitMap, ['shipGroupSeqId', 'orderItemSeqId']);
orderItems.each { orderItemAndShipGroupAssoc ->
- product = orderItemAndShipGroupAssoc.getRelatedOne("Product");
+ product = orderItemAndShipGroupAssoc.getRelatedOne("Product", false);
// Get the order item, since the orderItemAndShipGroupAssoc's quantity field is manipulated in some cases
orderItem = delegator.findOne("OrderItem", [orderId : orderId, orderItemSeqId : orderItemAndShipGroupAssoc.orderItemSeqId], false);
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy?rev=1343488&r1=1343487&r2=1343488&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy Tue May 29 04:14:02 2012
@@ -30,7 +30,7 @@ if (shipment) {
if (shipmentPackageRouteSegs) {
shipmentPackageRouteSegs.each { shipmentPackageRouteSeg ->
shipmentPackages = shipmentPackageRouteSeg.getRelated("ShipmentPackage", null, ['shipmentPackageSeqId']);
- shipmentRouteSegment = shipmentPackageRouteSeg.getRelatedOne("ShipmentRouteSegment");
+ shipmentRouteSegment = shipmentPackageRouteSeg.getRelatedOne("ShipmentRouteSegment", false);
if (shipmentPackages) {
shipmentPackages.each { shipmentPackage ->
shipmentItemsDatas = [] as LinkedList;
@@ -39,7 +39,7 @@ if (shipment) {
shipmentPackageContents.each { shipmentPackageContent ->
shipmentItemsData = [:];
packageQuantity = shipmentPackageContent.getDouble("quantity");
- shipmentItem = shipmentPackageContent.getRelatedOne("ShipmentItem");
+ shipmentItem = shipmentPackageContent.getRelatedOne("ShipmentItem", false);
if (shipmentItem) {
shippedQuantity = shipmentItem.getDouble("quantity");
shipmentItemsData.shipmentItem = shipmentItem;