svn commit: r1343498 - in /ofbiz/trunk/specialpurpose/oagis: src/org/ofbiz/oagis/OagisShipmentServices.java webapp/oagis/message/ProcessShipment.ftl webapp/oagis/message/ReceiveDelivery.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1343498 - in /ofbiz/trunk/specialpurpose/oagis: src/org/ofbiz/oagis/OagisShipmentServices.java webapp/oagis/message/ProcessShipment.ftl webapp/oagis/message/ReceiveDelivery.ftl

doogie-3
Author: doogie
Date: Tue May 29 04:15:36 2012
New Revision: 1343498

URL: http://svn.apache.org/viewvc?rev=1343498&view=rev
Log:
DEPRECATION: specialpurpose/oagis: getRelatedOne variants replaced with a getRelatedOne variant that takes a boolean useCache parameter.

Modified:
    ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
    ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
    ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl

Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1343498&r1=1343497&r2=1343498&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Tue May 29 04:15:36 2012
@@ -1099,7 +1099,7 @@ public class OagisShipmentServices {
 
                 // for each ReturnItem also get serial numbers using ItemIssuanceAndInventoryItem
                 // NOTE: technically if the ReturnItem.quantity != OrderItem.quantity then we don't know which serial number is being returned, so rather than guessing we will send it only in that case
-                GenericValue orderItem = returnItem.getRelatedOne("OrderItem");
+                GenericValue orderItem = returnItem.getRelatedOne("OrderItem", false);
                 if (orderItem != null) {
                     if (orderItem.getDouble("quantity").doubleValue() == itemQty) {
                         List<GenericValue> itemIssuanceAndInventoryItemList = delegator.findByAnd("ItemIssuanceAndInventoryItem",

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?rev=1343498&r1=1343497&r2=1343498&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Tue May 29 04:15:36 2012
@@ -117,8 +117,8 @@ under the License.
           </#if>
         </os:PARTNER>
         <#list shipmentItems as shipmentItem>
-        <#assign product = shipmentItem.getRelatedOne("Product")>
-        <#assign productType = product.getRelatedOne("ProductType")>
+        <#assign product = shipmentItem.getRelatedOne("Product", false)>
+        <#assign productType = product.getRelatedOne("ProductType", false)>
         <#if productType.isPhysical == "Y" || productType.isPhysical == "y">
         <n:SHIPITEM>
             <os:QUANTITY>

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl?rev=1343498&r1=1343497&r2=1343498&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl Tue May 29 04:15:36 2012
@@ -86,7 +86,7 @@ under the License.
                     <of:UOM>EACH</of:UOM>
                 </os:QUANTITY>
                 <#list returnItems as returnItem>
-                    <#assign returnReason = returnItem.getRelatedOne("ReturnReason")/>
+                    <#assign returnReason = returnItem.getRelatedOne("ReturnReason", false)/>
                     <#assign serialNumberList = serialNumberListByReturnItemSeqIdMap.get(returnItem.returnItemSeqId)?if_exists/>
                 <n:RECEIPTITM>
                     <os:QUANTITY>