svn commit: r542117 - /ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java

[jacopoc]

Author: jacopoc
Date: Sun May 27 22:45:36 2007
New Revision: 542117

URL: http://svn.apache.org/viewvc?view=rev&rev=542117
Log:
Added orderItemSeqId code to the equals(...) method of the packing session's ItemDisplay subclass: this is needed because we are currently showing items by order line in the pack screen.

Modified:
    ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?view=diff&rev=542117&r1=542116&r2=542117
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Sun May 27 22:45:36 2007
@@ -997,7 +997,9 @@
                 } else if (d.getOrderItem().getString("productId") != null || orderItem.getString("productId") != null) {
                     sameOrderItemProduct = false;
                 }
-                return (d.productId.equals(productId) && sameOrderItemProduct);
+                return (d.productId.equals(productId) &&
+                        d.getOrderItem().getString("orderItemSeqId").equals(orderItem.getString("orderItemSeqId")) &&
+                        sameOrderItemProduct);
             } else {
                 return false;
             }