svn commit: r1603445 - in /ofbiz/branches/release13.07: ./ applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java

[jacopoc]

Author: jacopoc
Date: Wed Jun 18 13:10:51 2014
New Revision: 1603445

URL: http://svn.apache.org/r1603445
Log:
Applied fix from trunk for revision: 1603439
===

Applied fix for OFBIZ-5622: during invoicing, only one ShipmentItemBilling was created for the first InvoiceItem.
Thanks to Christian Geisert for the fix.


Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1603439

Modified: ofbiz/branches/release13.07/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1603445&r1=1603444&r2=1603445&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/branches/release13.07/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Wed Jun 18 13:10:51 2014
@@ -487,7 +487,7 @@ public class InvoiceServices {
                 }
 
                 if ("ItemIssuance".equals(currentValue.getEntityName())) {
-                    List<GenericValue> shipmentItemBillings = delegator.findByAnd("ShipmentItemBilling", UtilMisc.toMap("shipmentId", currentValue.get("shipmentId")), null, false);
+                    List<GenericValue> shipmentItemBillings = delegator.findByAnd("ShipmentItemBilling", UtilMisc.toMap("shipmentId", currentValue.get("shipmentId"), "shipmentItemSeqId", currentValue.get("shipmentItemSeqId")), null, false);
                     if (UtilValidate.isEmpty(shipmentItemBillings)) {
 
                         // create the ShipmentItemBilling record