Author: jacopoc
Date: Wed Jun 18 12:59:05 2014
New Revision: 1603439
URL:
http://svn.apache.org/r1603439Log:
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/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1603439&r1=1603438&r2=1603439&view=diff==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Wed Jun 18 12:59:05 2014
@@ -486,7 +486,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