svn commit: r785558 - /ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java

[ashish-18]

Author: ashish
Date: Wed Jun 17 11:12:10 2009
New Revision: 785558

URL: http://svn.apache.org/viewvc?rev=785558&view=rev
Log:
Applied fix from trunk revision: 785557.
Applied patch from jira issue OFBIZ-2620 (Bug in InvoiceServices.createInvoicesFromShipments service)
Thanks Mridul for the contribution.

Modified:
    ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java

Modified: ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=785558&r1=785557&r2=785558&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Wed Jun 17 11:12:10 2009
@@ -1280,7 +1280,11 @@
                 if (billAvail != null && billAvail.signum() == 1) { // this checks if billAvail is a positive non-zero number
                     if (issueQty != null && issueQty.compareTo(billAvail) > 0) {
                         // can only bill some of the issuance; others have been billed already
-                        issue.set("quantity", billAvail);
+                        if ("ShipmentReceipt".equals(issue.getEntityName())) {
+                            issue.set("quantityAccepted", billAvail);
+                        } else {
+                            issue.set("quantity", billAvail);
+                        }
                         billAvail = ZERO;
                     } else {
                         // now have been billed