@@ -5,7 +5,7 @@ class Transaction < ActiveRecord::Base named_scope :authoratative_order, :conditions => [ 'ofx_deleted is null OR ofx_deleted = ?', false], :order => 'recorded_on desc, ofx_fit_id desc, id desc' named_scope :reverse_auth_order, :conditions => [ 'ofx_deleted is null OR ofx_deleted = ?', false], :order => 'recorded_on asc, ofx_fit_id asc, id asc' - named_scope :uncategorized, :conditions => 'ledger_entry_id is null' + named_scope :uncategorized, :conditions => [ 'ledger_entry_id is null and ofx_deleted is null AND reconciled = ?', true ] validates_uniqueness_of :ofx_fit_id, :scope => :financial_account_id, :allow_nil => true app/models/transaction.rb @@ -1,4 +1,4 @@ -- if @trans_list.respond_to?(:total_pages) +- if trans_list.respond_to?(:total_pages) .pagination = will_paginate trans_list, :page_links => false @@ -35,6 +35,6 @@ | = link_to "E", edit_transaction_path(t) -- if @trans_list.respond_to?(:total_pages) +- if trans_list.respond_to?(:total_pages) .pagination = will_paginate trans_list, :page_links => false app/views/transactions/_list.html.haml be708a12166401cfee436cb7b1114dbedc268a48 Jordan Curzon curzonj@gmail.com http://github.com/curzonj/ledgers/commit/92ab41e2a9ba15c07b4993aceb2c58546df0b0b2 92ab41e2a9ba15c07b4993aceb2c58546df0b0b2 2009-11-02T02:53:52-08:00 2009-11-02T02:53:52-08:00 Fixed categorizing issues 47feebdca711f9f2de875075888c49da26b674ac Jordan Curzon curzonj@gmail.com