ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r1724952 - in /ofbiz/branches/release15.12: ./ applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
Date Sat, 16 Jan 2016 10:52:55 GMT
Author: deepak
Date: Sat Jan 16 10:52:55 2016
New Revision: 1724952

URL: http://svn.apache.org/viewvc?rev=1724952&view=rev
Log:
Applied fix from trunk for revision: 1724951 
===

(OFBIZ-6806) Applied patch from jira issue OFBIZ-6806
============================================================
Order Item with multiple qty reserved with multiple inventory item not correctly recorded
into Shipment_Item_Billing
============================================================

Thanks Swapnil Shah for reporting the issue and Ankush for providing the patch.

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

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 10:52:55 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946
+/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951

Modified: ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1724952&r1=1724951&r2=1724952&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
(original)
+++ ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
Sat Jan 16 10:52:55 2016
@@ -490,8 +490,12 @@ public class InvoiceServices {
                 }
 
                 if ("ItemIssuance".equals(currentValue.getEntityName())) {
+                    /* Find ShipmentItemBilling based on shipmentId, shipmentItemSeqId, invoiceId,
invoiceItemSeqId as
+                       because if any order item has multiple quantity and reserved by multiple
inventories then there will be multiple invoice items.
+                       In that case ShipmentItemBilling was creating only for one invoice
item. Fixed under OFBIZ-6806.
+                    */
                     List<GenericValue> shipmentItemBillings = EntityQuery.use(delegator).from("ShipmentItemBilling")
-                            .where("shipmentId", currentValue.get("shipmentId"), "shipmentItemSeqId",
currentValue.get("shipmentItemSeqId"))
+                            .where("shipmentId", currentValue.get("shipmentId"), "shipmentItemSeqId",
currentValue.get("shipmentItemSeqId"), "invoiceId", invoiceId, "invoiceItemSeqId", invoiceItemSeqId)
                             .queryList();
                     if (UtilValidate.isEmpty(shipmentItemBillings)) {
 



Mime
View raw message