OFBiz › OFBiz - Commits

svn commit: r1343515 [2/2] - in /ofbiz/trunk/applications/order: src/org/ofbiz/order/order/ src/org/ofbiz/order/requirement/ src/org/ofbiz/order/shoppingcart/ src/org/ofbiz/order/shoppingcart/product/ src/org/ofbiz/order/shoppinglist/ webapp/ordermgr/W...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

doogie-3

svn commit: r1343515 [2/2] - in /ofbiz/trunk/applications/order: src/org/ofbiz/order/order/ src/org/ofbiz/order/requirement/ src/org/ofbiz/order/shoppingcart/ src/org/ofbiz/order/shoppingcart/product/ src/org/ofbiz/order/shoppinglist/ webapp/ordermgr/W...

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1343515&r1=1343514&r2=1343515&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Tue May 29 04:18:30 2012
@@ -69,7 +69,7 @@ under the License.
<#else>
${orderItem.itemDescription?if_exists}
</#if>
- <#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute")/>
+ <#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute", null, null, false)/>
<#if orderItemAttributes?has_content>
<ul>
<#list orderItemAttributes as orderItemAttribute>
@@ -204,7 +204,7 @@ under the License.
</#list>
</div>
</div>
- <#assign returns = orderItem.getRelated("ReturnItem")?if_exists>
+ <#assign returns = orderItem.getRelated("ReturnItem", null, null, false)?if_exists>
<#if returns?has_content>
<#list returns as returnItem>
<#assign returnHeader = returnItem.getRelatedOne("ReturnHeader", false)>
@@ -318,7 +318,7 @@ under the License.
</#if>
</tr>
<#-- show info from workeffort -->
- <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")?if_exists>
+ <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)?if_exists>
<#if workOrderItemFulfillments?has_content>
<#list workOrderItemFulfillments as workOrderItemFulfillment>
<#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort", true)>
@@ -380,7 +380,7 @@ under the License.
</#list>
</#if>
<#-- show linked requirements -->
- <#assign linkedRequirements = orderItem.getRelated("OrderRequirementCommitment")?if_exists>
+ <#assign linkedRequirements = orderItem.getRelated("OrderRequirementCommitment", null, null, false)?if_exists>
<#if linkedRequirements?has_content>
<#list linkedRequirements as linkedRequirement>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
@@ -520,7 +520,7 @@ under the License.
</tr>
</#if>
<#-- now show ship group info per line item -->
- <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc")?if_exists>
+ <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc", null, null, false)?if_exists>
<#if orderItemShipGroupAssocs?has_content>
<#list orderItemShipGroupAssocs as shipGroupAssoc>
<#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)>
@@ -564,7 +564,7 @@ under the License.
</#list>
</#if>
<#-- now show planned shipment info per line item -->
- <#assign orderShipments = orderItem.getRelated("OrderShipment")?if_exists>
+ <#assign orderShipments = orderItem.getRelated("OrderShipment", null, null, false)?if_exists>
<#if orderShipments?has_content>
<#list orderShipments as orderShipment>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
@@ -628,7 +628,7 @@ under the License.
</#list>
</#if>
<#-- now show shipment receipts per line item -->
- <#assign shipmentReceipts = orderItem.getRelated("ShipmentReceipt")?if_exists>
+ <#assign shipmentReceipts = orderItem.getRelated("ShipmentReceipt", null, null, false)?if_exists>
<#if shipmentReceipts?has_content>
<#list shipmentReceipts as shipmentReceipt>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=1343515&r1=1343514&r2=1343515&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Tue May 29 04:18:30 2012
@@ -195,7 +195,7 @@ under the License.
<td><#if productStore?has_content>${productStore.storeName?default(productStore.productStoreId)}</#if></td>
<td><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom/></td>
<td>
- <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder")>
+ <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder", null, null, false)>
<#list trackingCodes as trackingCode>
<#if trackingCode?has_content>
<a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br />

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1343515&r1=1343514&r2=1343515&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Tue May 29 04:18:30 2012
@@ -49,7 +49,7 @@ under the License.
<th>${uiLabelMap.CommonStatus}</th>
</tr>
<#list orderPaymentPreferences as orderPaymentPreference>
- <#assign payments = orderPaymentPreference.getRelated("Payment")>
+ <#assign payments = orderPaymentPreference.getRelated("Payment", null, null, false)>
<#list payments as payment>
<#assign statusItem = payment.getRelatedOne("StatusItem", false)>
<#assign partyName = delegator.findOne("PartyNameView", {"partyId" : payment.partyIdTo}, true)>
@@ -112,7 +112,7 @@ under the License.
<tr><td colspan="4"><hr /></td></tr>
<#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content>
<#list orderPaymentPreferences as orderPaymentPreference>
- <#assign paymentList = orderPaymentPreference.getRelated("Payment")>
+ <#assign paymentList = orderPaymentPreference.getRelated("Payment", null, null, false)>
<#assign pmBillingAddress = {}>
<#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem", false)>
<#if outputted?default("false") == "true">
@@ -174,7 +174,7 @@ under the License.
<#elseif paymentMethodType.paymentMethodTypeId == "FIN_ACCOUNT">
<#assign finAccount = orderPaymentPreference.getRelatedOne("FinAccount", false)?if_exists/>
<#if (finAccount?has_content)>
- <#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse")>
+ <#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", null, null, false)>
<#assign finAccountType = finAccount.getRelatedOne("FinAccountType", false)?if_exists/>
<tr>
<td align="right" valign="top" width="29%">
@@ -317,7 +317,7 @@ under the License.
</#if>
<#else>
<#if paymentMethod.paymentMethodTypeId?if_exists == "CREDIT_CARD">
- <#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse")>
+ <#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", null, null, false)>
<#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)?if_exists>
<#if creditCard?has_content>
<#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress", false)?if_exists>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1343515&r1=1343514&r2=1343515&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue May 29 04:18:30 2012
@@ -564,7 +564,7 @@ under the License.
</form>
</td>
</tr>
- <#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment")>
+ <#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment", null, null, false)>
<#if shipGroupShipments?has_content>
<tr><td colspan="3"><hr /></td></tr>
<tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1343515&r1=1343514&r2=1343515&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Tue May 29 04:18:30 2012
@@ -60,7 +60,7 @@ under the License.
<#assign selectedAmount = 1/>
</#if>
<#assign quoteItemAmount = quoteItem.quoteUnitPrice?default(0) * quoteItem.quantity?default(0) * selectedAmount>
- <#assign quoteItemAdjustments = quoteItem.getRelated("QuoteAdjustment")>
+ <#assign quoteItemAdjustments = quoteItem.getRelated("QuoteAdjustment", null, null, false)>
<#assign totalQuoteItemAdjustmentAmount = 0.0>
<#list quoteItemAdjustments as quoteItemAdjustment>
<#assign totalQuoteItemAdjustmentAmount = quoteItemAdjustment.amount?default(0) + totalQuoteItemAdjustmentAmount>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?rev=1343515&r1=1343514&r2=1343515&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Tue May 29 04:18:30 2012
@@ -45,7 +45,7 @@ under the License.
<#assign product = quoteItem.getRelatedOne("Product", false)>
</#if>
<#assign quoteItemAmount = quoteItem.quoteUnitPrice?default(0) * quoteItem.quantity?default(0)>
- <#assign quoteItemAdjustments = quoteItem.getRelated("QuoteAdjustment")>
+ <#assign quoteItemAdjustments = quoteItem.getRelated("QuoteAdjustment", null, null, false)>
<#assign totalQuoteItemAdjustmentAmount = 0.0>
<#list quoteItemAdjustments as quoteItemAdjustment>
<#assign totalQuoteItemAdjustmentAmount = quoteItemAdjustment.amount?default(0) + totalQuoteItemAdjustmentAmount>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=1343515&r1=1343514&r2=1343515&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Tue May 29 04:18:30 2012
@@ -147,7 +147,7 @@ under the License.
<#assign returnReason = item.getRelatedOne("ReturnReason", false)?if_exists>
<#assign returnType = item.getRelatedOne("ReturnType", false)?if_exists>
<#assign status = item.getRelatedOne("InventoryStatusItem", false)?if_exists>
- <#assign shipmentReceipts = item.getRelated("ShipmentReceipt")?if_exists>
+ <#assign shipmentReceipts = item.getRelated("ShipmentReceipt", null, null, false)?if_exists>
<#if (item.get("returnQuantity")?exists && item.get("returnPrice")?exists)>
<#assign returnTotal = returnTotal + item.get("returnQuantity") * item.get("returnPrice") >
<#assign returnItemSubTotal = item.get("returnQuantity") * item.get("returnPrice") >
@@ -273,7 +273,7 @@ under the License.
</#if>
</tr>
<#assign rowCount = rowCount + 1>
- <#assign returnItemAdjustments = item.getRelated("ReturnAdjustment")>
+ <#assign returnItemAdjustments = item.getRelated("ReturnAdjustment", null, null, false)>
<#if (returnItemAdjustments?has_content)>
<#list returnItemAdjustments as returnItemAdjustment>
<@displayReturnAdjustment returnAdjustment=returnItemAdjustment adjEditable=false/> <#-- adjustments of return items should never be editable -->

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl?rev=1343515&r1=1343514&r2=1343515&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl Tue May 29 04:18:30 2012
@@ -78,7 +78,7 @@ under the License.
</fo:table-row>
<#assign total = total + returnItem.returnQuantity.doubleValue() * returnItem.returnPrice.doubleValue()/>

- <#assign returnItemAdjustments = returnItem.getRelated("ReturnAdjustment")>
+ <#assign returnItemAdjustments = returnItem.getRelated("ReturnAdjustment", null, null, false)>
<#if (returnItemAdjustments?has_content)>
<#list returnItemAdjustments as returnItemAdjustment>
<@displayReturnAdjustment returnAdjustment=returnItemAdjustment/>