From: Roland Häder Date: Wed, 26 Jun 2019 17:48:20 +0000 (+0200) Subject: Updated jar(s) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5ad773862e24eae3cb4928d14695df8253ae07a0;p=jfinancials-core.git Updated jar(s) Signed-off-by: Roland Häder --- diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar index 383fabf..d0cf3b4 100644 Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index 8ca32be..73c9b77 100644 Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 4b43b90..0e464c4 100644 Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ diff --git a/lib/jcustomer-core.jar b/lib/jcustomer-core.jar index c68b4a6..1c1346e 100644 Binary files a/lib/jcustomer-core.jar and b/lib/jcustomer-core.jar differ diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 206fa6a..e70cda1 100644 Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar index d986e08..3f6e005 100644 Binary files a/lib/jproduct-core.jar and b/lib/jproduct-core.jar differ diff --git a/lib/juser-core.jar b/lib/juser-core.jar index ee207ea..51e3ec4 100644 Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ diff --git a/src/org/mxchange/jfinancials/model/receipt/Receipts.java b/src/org/mxchange/jfinancials/model/receipt/Receipts.java index a2f6d8a..406d7eb 100644 --- a/src/org/mxchange/jfinancials/model/receipt/Receipts.java +++ b/src/org/mxchange/jfinancials/model/receipt/Receipts.java @@ -127,6 +127,9 @@ public class Receipts implements Serializable { } else if (!Objects.equals(receipt1.getReceiptNumber(), receipt2.getReceiptNumber())) { // Other receipt number return false; + } else if (!Objects.equals(receipt1.getReceiptIssued(), receipt2.getReceiptIssued())) { + // Other issue date + return false; } else if (!Objects.equals(receipt1.getReceiptUser(), receipt2.getReceiptUser())) { // Other user (unlikely to happen return false; diff --git a/src/org/mxchange/jfinancials/model/receipt_item/ReceiptItems.java b/src/org/mxchange/jfinancials/model/receipt_item/ReceiptItems.java index dea7327..eacc8d1 100644 --- a/src/org/mxchange/jfinancials/model/receipt_item/ReceiptItems.java +++ b/src/org/mxchange/jfinancials/model/receipt_item/ReceiptItems.java @@ -112,6 +112,9 @@ public class ReceiptItems implements Serializable { } else if (!Objects.equals(receiptItem1.getItemProductQuantity(), receiptItem2.getItemProductQuantity())) { // Other item quantity return false; + } else if (!Objects.equals(receiptItem1.getItemNumber(), receiptItem2.getItemNumber())) { + // Other item number + return false; } // Maybe same receipt!