You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/08/01 05:34:08 UTC
svn commit: r1754703 - in /ofbiz/trunk/applications:
accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
product/minilang/product/inventory/InventoryIssueServices.xml
Author: jleroux
Date: Mon Aug 1 05:34:08 2016
New Revision: 1754703
URL: http://svn.apache.org/viewvc?rev=1754703&view=rev
Log:
No functional changes
Removes reference to the POS, adds reference to webPos
Modified:
ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml
Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java?rev=1754703&r1=1754702&r2=1754703&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java Mon Aug 1 05:34:08 2016
@@ -530,11 +530,10 @@ public class InvoiceServices {
"AccountingTroubleCallingCalculateInvoicedAdjustmentTotalService", locale));
}
- // If the absolute invoiced amount >= the abs of the adjustment amount, the full amount has already been invoiced,
- // so skip this adjustment
-// if (adj.get("amount") == null) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, item(s) here) and a cash amount higher than total (hence issuing change)
+// if (adj.get("amount") == null) { TODO check usage with webPos. Was: fix a bug coming from POS in case of use of a discount (on item(s) or sale, item(s) here) and a cash amount higher than total (hence issuing change)
// continue;
// }
+ // If the absolute invoiced amount >= the abs of the adjustment amount, the full amount has already been invoiced, so skip this adjustment
if (adjAlreadyInvoicedAmount.abs().compareTo(adj.getBigDecimal("amount").setScale(invoiceTypeDecimals, ROUNDING).abs()) > 0) {
continue;
}
@@ -666,11 +665,10 @@ public class InvoiceServices {
"AccountingTroubleCallingCalculateInvoicedAdjustmentTotalService", locale));
}
- // If the absolute invoiced amount >= the abs of the adjustment amount, the full amount has already been invoiced,
- // so skip this adjustment
-// if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change)
+// if (null == adj.get("amount")) { TODO check usage with webPos. Was: fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change)
// continue;
// }
+ // If the absolute invoiced amount >= the abs of the adjustment amount, the full amount has already been invoiced, so skip this adjustment
if (adjAlreadyInvoicedAmount.abs().compareTo(adj.getBigDecimal("amount").setScale(invoiceTypeDecimals, ROUNDING).abs()) > 0) {
continue;
}
@@ -1929,7 +1927,7 @@ public class InvoiceServices {
if (isNonPhysicalItemToReturn) {
if (UtilValidate.isEmpty(billItems)) {
- billItems = new ArrayList();
+ billItems = new ArrayList<GenericValue>();
}
billItems.add(returnItem);
Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml?rev=1754703&r1=1754702&r2=1754703&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml Mon Aug 1 05:34:08 2016
@@ -32,7 +32,8 @@ under the License.
<get-related list="orderItemList" relation-name="OrderItem" value-field="orderHeader"/>
<!-- before issuing inventory, check to see if there is inventory information in this database -->
- <!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals -->
+ <!-- if inventory info is not available for all of the products, then don't do the issuance,
+ ie there has to be at least SOME inventory info in the database to facilitate inventory-less cases -->
<entity-count entity-name="InventoryItem" count-field="iiCount">
<condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/>
</entity-count>