Merge branch 'portfolio-performance:master' into WindowsInstaller

Author: arnonm

CONTRIBUTING.md

@@ -376,16 +376,13 @@ All images and icons must be [Creative Commons CC0](https://creativecommons.org/
 **Sources**
 - Use icons from [iconmonstr.com](https://iconmonstr.com) only
 - Register all images in [Images.java](https://github.com/portfolio-performance/portfolio/blob/master/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Images.java)
-
-**Format Requirements**
-- **Format**: PNG with transparent background
-- **Sizes**: Create 16x16px and 32x32px versions
-  - `image.png` (16x16px)
-  - `[email protected]` (32x32px)
+- Use **SVG** format with width and height set to 16px; add a fill color if needed
+- Note: For historical reasons, some icons are still available in PNG format with two resolutions (@1x and @2x). New icons should use SVG format only.
 
 **Color Guidelines**
 - **Passive state**: #393E42 (dark, cool gray)
 - **Active state**: #F18F01 (orange)
+- **Error state**: #D11D1D (dark red)
 
 See [Color Code Reference](#color-code-reference) for exact colors.
 

name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/ExtractorUtilsDateParserTest.java

@@ -156,6 +156,7 @@ public void testAsDateValidFormatsWithHints()
         assertEquals(expected, ExtractorUtils.asDate("11 APR 2023", Locale.UK));
         assertEquals(expected, ExtractorUtils.asDate("11 April 2023", Locale.UK));
         assertEquals(expected, ExtractorUtils.asDate("11 APRIL 2023", Locale.UK));
+        assertEquals(expected, ExtractorUtils.asDate("11-Apr-2023", Locale.UK));
 
         expected = LocalDateTime.of(2023, 4, 1, 0, 0);
         assertEquals(expected, ExtractorUtils.asDate("4/1/2023", Locale.UK));
@@ -166,6 +167,8 @@ public void testAsDateValidFormatsWithHints()
         assertEquals(expected, ExtractorUtils.asDate("01 Apr 2023", Locale.UK));
         assertEquals(expected, ExtractorUtils.asDate("1 APR 2023", Locale.UK));
         assertEquals(expected, ExtractorUtils.asDate("01 APR 2023", Locale.UK));
+        assertEquals(expected, ExtractorUtils.asDate("1-Apr-2023", Locale.UK));
+        assertEquals(expected, ExtractorUtils.asDate("01-Apr-2023", Locale.UK));
     }
 
     @Test(expected = DateTimeParseException.class)

name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/actions/DetectDuplicatesActionTest.java

@@ -33,7 +33,7 @@ public class DetectDuplicatesActionTest
     @Test
     public void testDuplicateDetection4AccountTransaction() throws IntrospectionException, ReflectiveOperationException
     {
-        DetectDuplicatesAction action = new DetectDuplicatesAction(new Client());
+        var action = new DetectDuplicatesAction(new Client());
 
         new PropertyChecker<AccountTransaction>(
                         AccountTransaction.class, "note", "source", "forex", "monetaryAmount", "updatedAt")
@@ -49,7 +49,7 @@ public void testDuplicateDetection4AccountTransaction() throws IntrospectionExce
     public void testDuplicateDetection4PortfolioTransaction()
                     throws IntrospectionException, ReflectiveOperationException
     {
-        DetectDuplicatesAction action = new DetectDuplicatesAction(new Client());
+        var action = new DetectDuplicatesAction(new Client());
 
         new PropertyChecker<PortfolioTransaction>(PortfolioTransaction.class, "fees", "taxes", "note", "source",
                         "forex", "monetaryAmount", "updatedAt") //
@@ -65,7 +65,7 @@ public void testDuplicateDetection4PortfolioTransaction()
     public void testDuplicateDetectionWithPurchaseAndDeliveryPairs()
                     throws IntrospectionException, ReflectiveOperationException
     {
-        DetectDuplicatesAction action = new DetectDuplicatesAction(new Client());
+        var action = new DetectDuplicatesAction(new Client());
 
         new PropertyChecker<PortfolioTransaction>(PortfolioTransaction.class, "type", "fees", "taxes", "note", "source",
                         "forex", "monetaryAmount", "updatedAt") //
@@ -93,6 +93,53 @@ public void testDuplicateDetectionWithPurchaseAndDeliveryPairs()
 
     }
 
+    @Test
+    public void testDuplicateDetectionWithTransferInAndDeposit()
+    {
+        var transferIn = getTestEntry(AccountTransaction.Type.TRANSFER_IN);
+        var deposit = getTestEntry(AccountTransaction.Type.DEPOSIT);
+
+        var action = new DetectDuplicatesAction(new Client());
+
+        var status = action.process(deposit, account(transferIn));
+
+        assertThat(status.getCode(), is(Code.WARNING));
+
+        // check vice versa
+        status = action.process(transferIn, account(deposit));
+
+        assertThat(status.getCode(), is(Code.WARNING));
+    }
+
+    @Test
+    public void testDuplicateDetectionWithTransferOutAndWithdrawal()
+    {
+        var transferOut = getTestEntry(AccountTransaction.Type.TRANSFER_OUT);
+        var withdrawl = getTestEntry(AccountTransaction.Type.REMOVAL);
+
+        var action = new DetectDuplicatesAction(new Client());
+
+        var status = action.process(withdrawl, account(transferOut));
+
+        assertThat(status.getCode(), is(Code.WARNING));
+
+        // check vice versa
+        status = action.process(transferOut, account(withdrawl));
+
+        assertThat(status.getCode(), is(Code.WARNING));
+    }
+
+    private AccountTransaction getTestEntry(AccountTransaction.Type type)
+    {
+        var transaction = new AccountTransaction();
+        transaction.setType(type);
+        transaction.setAmount(1000);
+        transaction.setCurrencyCode("EUR"); //$NON-NLS-1$
+        transaction.setDateTime(LocalDateTime.of(2025, 12, 15, 0, 0));
+
+        return transaction;
+    }
+
     private Account account(AccountTransaction t)
     {
         Account a = new Account();

name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/bison/BisonPDFExtractorTest.java

@@ -267,7 +267,7 @@ public void testInfoReport03()
                         hasFeed(CoinGeckoQuoteFeed.ID), //
                         hasFeedProperty(CoinGeckoQuoteFeed.COINGECKO_COIN_ID, "bitcoin"))));
 
-        // check removal transaction
+        // check withdrawal transaction
         assertThat(results, hasItem(removal( //
                         hasDate("2020-11-22T09:51"), //
                         hasSource("InfoReport03.txt"), //