Fixed dialog as it allowed to create a dividend tx w/o security info

portfolio-performance · Dec 3, 2017 · cf12bd2 · cf12bd2
1 parent 741d2d3
commit cf12bd2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...folio.ui/src/name/abuchen/portfolio/ui/dialogs/transactions/AccountTransactionDialog.java b/...folio.ui/src/name/abuchen/portfolio/ui/dialogs/transactions/AccountTransactionDialog.java
@@ -301,7 +301,12 @@ private ComboInput setupSecurities(Composite editArea)
         // add empty security only if it has not been added previously
         // --> happens when editing an existing transaction
         if (model().supportsOptionalSecurity() && !activeSecurities.contains(AccountTransactionModel.EMPTY_SECURITY))
+        {
             activeSecurities.add(0, AccountTransactionModel.EMPTY_SECURITY);
+
+            if (model().getSecurity() == null)
+                model().setSecurity(AccountTransactionModel.EMPTY_SECURITY);
+        }
 
         ComboInput securities = new ComboInput(editArea, Messages.ColumnSecurity);
         securities.value.setInput(activeSecurities);

diff --git a/...tfolio.ui/src/name/abuchen/portfolio/ui/dialogs/transactions/AccountTransactionModel.java b/...tfolio.ui/src/name/abuchen/portfolio/ui/dialogs/transactions/AccountTransactionModel.java
@@ -41,7 +41,7 @@ public enum Properties
     private Account sourceAccount;
     private AccountTransaction sourceTransaction;
 
-    private Security security = EMPTY_SECURITY;
+    private Security security;
     private Account account;
     private LocalDate date = LocalDate.now();
     private long shares;