Allows linking of cash adjustment transactions when adding (Issue 131)

Author: fxdemolisher

frano/static/js/transactions.js

@@ -12,7 +12,6 @@ $(function() {
     var val = $(this).val();
     var isCash = (val == 'DEPOSIT' || val == 'WITHDRAW' || val == 'ADJUST');
     var wasCash = (lastTransactionType == 'DEPOSIT' || lastTransactionType == 'WITHDRAW' || lastTransactionType == 'ADJUST');
-    lastTransactionType = val;
 
     if(isCash != wasCash) {
       if(isCash) {
@@ -26,6 +25,14 @@ $(function() {
 
     $(".securitiesField").each(function (idx, obj) { $.validationEngine.closePrompt(obj) });
     $(".cashField").each(function (idx, obj) { $.validationEngine.closePrompt(obj) });
+    
+    if(lastTransactionType != val && val == 'ADJUST') {
+      $(".securitiesField[name=symbol]").attr("disabled", "").val("").css("background-color", "#FFFFFF");
+      $(".cashField[name=symbol]").attr("disabled", "disabled").val("").css("background-color", "#CCCCCC");
+    }
+    
+    lastTransactionType = val;
+    
   });
 
   $("#addTransactionForm input").keypress(function(e) {
@@ -35,8 +42,8 @@ $(function() {
     }
   });
 
-  $("#quantity, #price, #comission").change(function() {
-    $('#total').val((valueToFloat('#quantity', 0.0) * valueToFloat('#price', 0.0)) + valueToFloat('#comission', 0.0));
+  $("#quantity, #price, #commission").change(function() {
+    $('#total').val((valueToFloat('#quantity', 0.0) * valueToFloat('#price', 0.0)) + valueToFloat('#commission', 0.0));
   });
 
   $("#addTransaction").click(function () {
@@ -79,10 +86,10 @@ $(function() {
       return;
     }
 
-    $.getJSON('/priceQuote.json', { day: asOf.getDate(), month: asOf.getMonth() + 1, year: asOf.getFullYear(), symbol: symbol }, function(data, textStatus) {
+    $.getJSON('/priceQuote.json', { day: asOf.getDate(), month: asOf.getMonth() + 1, year: asOf.getFullYear(), symbol: symbol.toUpperCase() }, function(data, textStatus) {
       if(textStatus == 'success' && data.price > 0) {
         $('#price').val(data.price);
-        $('#total').val((valueToFloat('#quantity', 0.0) * valueToFloat('#price', 0.0)) + valueToFloat('#comission', 0.0));
+        $('#total').val((valueToFloat('#quantity', 0.0) * valueToFloat('#price', 0.0)) + valueToFloat('#commission', 0.0));
       }
     });
 

frano/transactions/views.py

@@ -61,17 +61,27 @@ def add(request, portfolio, is_sample, read_only):
 
     type = form.cleaned_data.get('type').encode('UTF-8')
 
-    transaction = Transaction()
-    transaction.portfolio = portfolio
-    transaction.type = type
-    transaction.as_of_date = form.cleaned_data.get('as_of_date')
-    transaction.symbol = form.cleaned_data.get('symbol').encode('UTF-8').upper()
-    transaction.quantity = form.cleaned_data.get('quantity')
-    transaction.price = form.cleaned_data.get('price')
-    transaction.total = (transaction.quantity * transaction.price) + commission
-    transaction.save()
+    symbol = form.cleaned_data.get('symbol').encode('UTF-8').upper()
+    linked_symbol = None
+    if type == 'ADJUST':
+      linked_symbol = symbol
+      
+    if type in ['DEPOSIT', 'WITHDRAW', 'ADJUST']:
+      symbol = CASH_SYMBOL
 
-    refresh_positions(portfolio, force = True)
+    if symbol != None and len(symbol) > 0:
+      transaction = Transaction()
+      transaction.portfolio = portfolio
+      transaction.type = type
+      transaction.as_of_date = form.cleaned_data.get('as_of_date')
+      transaction.symbol = symbol
+      transaction.quantity = form.cleaned_data.get('quantity')
+      transaction.price = form.cleaned_data.get('price')
+      transaction.total = (transaction.quantity * transaction.price) + commission
+      transaction.linked_symbol = linked_symbol
+      transaction.save()
+    
+      refresh_positions(portfolio, force = True)
 
   return redirect_to_portfolio_action('transactions', portfolio)
 
@@ -269,7 +279,7 @@ def request_import_type(request, portfolio, is_sample, read_only):
 class TransactionForm(forms.Form):
   type = forms.ChoiceField(choices = TRANSACTION_TYPES)
   as_of_date = forms.DateField()
-  symbol = forms.CharField(min_length = 1, max_length = 10)
+  symbol = forms.CharField(min_length = 1, max_length = 10, required = False)
   quantity = forms.FloatField()
   price = forms.FloatField(min_value = 0.01)
   commission = forms.FloatField(min_value = 0.01, required = False)